diff options
| author | kib <kib@FreeBSD.org> | 2011-03-17 11:23:12 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2011-03-17 11:23:12 +0000 |
| commit | 329130799d270217d976d559253a838c169cd221 (patch) | |
| tree | 6f510ed97ffb75854687733fe42caa1b67da9765 /sys/ufs | |
| parent | 1aee4516fc264f425932af170a3aa3702255e945 (diff) | |
| download | FreeBSD-src-329130799d270217d976d559253a838c169cd221.zip FreeBSD-src-329130799d270217d976d559253a838c169cd221.tar.gz | |
Remove the #if defined(FFS) || defined(IFS) braces around the calls to
ffs_snapgone(). ufs.ko module is not build with FFS define, causing
snapshot inode number slots in superblock never be freed, as well as a
reference on the snapshot vnode.
IFS was removed several years ago, and UFS/FFS separation was not
maintained for real.
Reported, analyzed and tested by: Yamagi Burmeister <lists yamagi org>
MFC after: 3 days
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ufs/ufs_lookup.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index e997718..d819f69 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -1252,10 +1252,8 @@ out: * drop its snapshot reference so that it will be reclaimed * when last open reference goes away. */ -#if defined(FFS) || defined(IFS) if (ip != 0 && (ip->i_flags & SF_SNAPSHOT) != 0 && ip->i_effnlink == 0) ffs_snapgone(ip); -#endif return (error); } @@ -1317,10 +1315,8 @@ ufs_dirrewrite(dp, oip, newinum, newtype, isrmdir) * drop its snapshot reference so that it will be reclaimed * when last open reference goes away. */ -#if defined(FFS) || defined(IFS) if ((oip->i_flags & SF_SNAPSHOT) != 0 && oip->i_effnlink == 0) ffs_snapgone(oip); -#endif return (error); } |
