Author: avg
Date: Sat Dec 1 19:24:09 2012
New Revision: 243777
URL: http://svnweb.freebsd.org/changeset/base/243777
Log:
MFC r243270: zfs_remove: assert that delete_now case is never true on FreeBSD
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sat Dec
1 19:22:18 2012 (r243776)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sat Dec
1 19:24:09 2012 (r243777)
@@ -1911,6 +1911,9 @@ top:
}
if (delete_now) {
+#ifdef __FreeBSD__
+ panic("zfs_remove: delete_now branch taken");
+#endif
if (xattr_obj_unlinked) {
ASSERT3U(xzp->z_links, ==, 2);
mutex_enter(&xzp->z_lock);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
