Author: avg
Date: Mon Nov 19 11:30:08 2012
New Revision: 243270
URL: http://svnweb.freebsd.org/changeset/base/243270

Log:
  zfs_remove: assert that delete_now case is never true on FreeBSD
  
  That case is specific to Solaris VFS and it would violate pretty
  fundamental contracts of FreeBSD VFS.
  
  Discussed with:       pjd
  MFC after:    12 days

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c     Mon Nov 
19 11:26:32 2012        (r243269)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c     Mon Nov 
19 11:30:08 2012        (r243270)
@@ -1908,6 +1908,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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to