Author: avg
Date: Sat Nov 24 12:40:23 2012
New Revision: 243482
URL: http://svnweb.freebsd.org/changeset/base/243482

Log:
  MFC r242568: zfs_vnode_lock: no need to double-guess caller's intentions here

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.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_vfsops.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c        
Sat Nov 24 12:37:48 2012        (r243481)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c        
Sat Nov 24 12:40:23 2012        (r243482)
@@ -1740,15 +1740,7 @@ zfs_vnode_lock(vnode_t *vp, int flags)
 
        ASSERT(vp != NULL);
 
-       /*
-        * Check if the file system wasn't forcibly unmounted in the meantime.
-        */
        error = vn_lock(vp, flags);
-       if (error == 0 && (vp->v_iflag & VI_DOOMED) != 0) {
-               VOP_UNLOCK(vp, 0);
-               error = ENOENT;
-       }
-
        return (error);
 }
 
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"

Reply via email to