[src/trunk]: src/sys/ufs/ffs Function ffs_reload() works on a read-only mount...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/055b51b1b2d5
branches:  trunk
changeset: 790077:055b51b1b2d5
user:      hannken <hannken%NetBSD.org@localhost>
date:      Mon Sep 16 12:36:54 2013 +0000

description:
Function ffs_reload() works on a read-only mount, so remove the call
to ffs_snapshot_mount() as it would panic later with "already on list"
when remounting read-write.

Should fix PR kern/48211 (Unclean shutdown with active snapshot causes
panic during reboot)

diffstat:

 sys/ufs/ffs/ffs_vfsops.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 6e25dab4c01a -r 055b51b1b2d5 sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Mon Sep 16 09:25:56 2013 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Mon Sep 16 12:36:54 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_vfsops.c,v 1.287 2013/08/11 04:36:17 dholland Exp $        */
+/*     $NetBSD: ffs_vfsops.c,v 1.288 2013/09/16 12:36:54 hannken Exp $ */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.287 2013/08/11 04:36:17 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.288 2013/09/16 12:36:54 hannken Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -803,8 +803,6 @@
                space = (char *)space + bsize;
                brelse(bp, 0);
        }
-       if (fs->fs_snapinum[0] != 0)
-               ffs_snapshot_mount(mp);
        /*
         * We no longer know anything about clusters per cylinder group.
         */