Author: avg
Date: Wed Jul 13 10:49:32 2016
New Revision: 302757
URL: https://svnweb.freebsd.org/changeset/base/302757

Log:
  fix a mismerge in r302751
  
  This is a direct commit.

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c   Wed Jul 13 
10:32:24 2016        (r302756)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c   Wed Jul 13 
10:49:32 2016        (r302757)
@@ -443,7 +443,6 @@ gfs_lookup_dot(vnode_t **vpp, vnode_t *d
                ASSERT(pvp != NULL);
                VN_HOLD(pvp);
                *vpp = pvp;
-               vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
                return (0);
        }
 
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to