aboutsummaryrefslogtreecommitdiff
path: root/sys/ufs/ffs/ffs_snapshot.c
diff options
context:
space:
mode:
authorKirk McKusick <mckusick@FreeBSD.org>2018-08-18 22:21:59 +0000
committerKirk McKusick <mckusick@FreeBSD.org>2018-08-18 22:21:59 +0000
commit7e038bc257e9c5f7563695b88b481e493a33576f (patch)
treed1186e77ac4b97483067bb633ce79107e226047e /sys/ufs/ffs/ffs_snapshot.c
parentdb7c2a482248b83d7e325ffa36ce14d93ab78ad2 (diff)
downloadsrc-7e038bc257e9c5f7563695b88b481e493a33576f.tar.gz
src-7e038bc257e9c5f7563695b88b481e493a33576f.zip
Replace the TRIM consolodation framework originally added in -r337396
driven by problems found with the algorithms being tested for TRIM consolodation. Reported by: Peter Holm Suggested by: kib Reviewed by: kib Sponsored by: Netflix
Notes
Notes: svn path=/head/; revision=338031
Diffstat (limited to 'sys/ufs/ffs/ffs_snapshot.c')
-rw-r--r--sys/ufs/ffs/ffs_snapshot.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index fed0456b13cb..4453c59517df 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -583,7 +583,7 @@ loop:
if (len != 0 && len < fs->fs_bsize) {
ffs_blkfree(ump, copy_fs, vp,
DIP(xp, i_db[loc]), len, xp->i_number,
- xvp->v_type, NULL);
+ xvp->v_type, NULL, SINGLETON_KEY);
blkno = DIP(xp, i_db[loc]);
DIP_SET(xp, i_db[loc], 0);
}
@@ -1265,7 +1265,7 @@ mapacct_ufs1(vp, oldblkp, lastblkp, fs, lblkno, expungetype)
if (blkno == BLK_SNAP)
blkno = blkstofrags(fs, lblkno);
ffs_blkfree(ITOUMP(ip), fs, vp, blkno, fs->fs_bsize, inum,
- vp->v_type, NULL);
+ vp->v_type, NULL, SINGLETON_KEY);
}
return (0);
}
@@ -1549,7 +1549,7 @@ mapacct_ufs2(vp, oldblkp, lastblkp, fs, lblkno, expungetype)
if (blkno == BLK_SNAP)
blkno = blkstofrags(fs, lblkno);
ffs_blkfree(ITOUMP(ip), fs, vp, blkno, fs->fs_bsize, inum,
- vp->v_type, NULL);
+ vp->v_type, NULL, SINGLETON_KEY);
}
return (0);
}