Module Name: src
Committed By: hannken
Date: Mon Sep 16 12:36:54 UTC 2013
Modified Files:
src/sys/ufs/ffs: ffs_vfsops.c
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.287 -r1.288 src/sys/ufs/ffs/ffs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.287 src/sys/ufs/ffs/ffs_vfsops.c:1.288
--- src/sys/ufs/ffs/ffs_vfsops.c:1.287 Sun Aug 11 04:36:17 2013
+++ src/sys/ufs/ffs/ffs_vfsops.c Mon Sep 16 12:36:54 2013
@@ -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 @@ ffs_reload(struct mount *mp, kauth_cred_
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.
*/
