Author: mckusick
Date: Sun May 29 18:09:14 2011
New Revision: 222455
URL: http://svn.freebsd.org/changeset/base/222455
Log:
MFC r222334:
The check for whether a block is going to be claimed by a snapshot
needs to happen before we notify the underlying layer that it is
being freed.
Modified:
stable/8/sys/ufs/ffs/ffs_alloc.c
Modified: stable/8/sys/ufs/ffs/ffs_alloc.c
==============================================================================
--- stable/8/sys/ufs/ffs/ffs_alloc.c Sun May 29 18:00:50 2011
(r222454)
+++ stable/8/sys/ufs/ffs/ffs_alloc.c Sun May 29 18:09:14 2011
(r222455)
@@ -1874,10 +1874,7 @@ ffs_blkfree_cg(ump, fs, devvp, bno, size
/* devvp is a normal disk device */
dev = devvp->v_rdev;
cgblkno = fsbtodb(fs, cgtod(fs, cg));
- ASSERT_VOP_LOCKED(devvp, "ffs_blkfree");
- if ((devvp->v_vflag & VV_COPYONWRITE) &&
- ffs_snapblkfree(fs, devvp, bno, size, inum))
- return;
+ ASSERT_VOP_LOCKED(devvp, "ffs_blkfree_cg");
}
#ifdef INVARIANTS
if ((u_int)size > fs->fs_bsize || fragoff(fs, size) != 0 ||
@@ -2024,6 +2021,17 @@ ffs_blkfree(ump, fs, devvp, bno, size, i
struct bio *bip;
struct ffs_blkfree_trim_params *tp;
+ /*
+ * Check to see if a snapshot wants to claim the block.
+ * Check that devvp is a normal disk device, not a snapshot,
+ * it has a snapshot(s) associated with it, and one of the
+ * snapshots wants to claim the block.
+ */
+ if (devvp->v_type != VREG &&
+ (devvp->v_vflag & VV_COPYONWRITE) &&
+ ffs_snapblkfree(fs, devvp, bno, size, inum)) {
+ return;
+ }
if (!ump->um_candelete) {
ffs_blkfree_cg(ump, fs, devvp, bno, size, inum);
return;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
