svn commit: r219789 - stable/8/sys/ufs/ufs
Konstantin Belousov
kib at FreeBSD.org
Sun Mar 20 00:43:43 UTC 2011
Author: kib
Date: Sun Mar 20 00:43:42 2011
New Revision: 219789
URL: http://svn.freebsd.org/changeset/base/219789
Log:
MFC r219712:
Remove the #if defined(FFS) || defined(IFS) braces around the calls to
ffs_snapgone(). ufs.ko module is not build with FFS define.
Modified:
stable/8/sys/ufs/ufs/ufs_lookup.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/ufs/ufs/ufs_lookup.c
==============================================================================
--- stable/8/sys/ufs/ufs/ufs_lookup.c Sat Mar 19 23:06:17 2011 (r219788)
+++ stable/8/sys/ufs/ufs/ufs_lookup.c Sun Mar 20 00:43:42 2011 (r219789)
@@ -1238,10 +1238,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);
}
@@ -1290,10 +1288,8 @@ ufs_dirrewrite(dp, oip, newinum, newtype
* 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);
}
More information about the svn-src-stable
mailing list