Author: rmacklem
Date: Sun May 22 21:04:32 2011
New Revision: 222199
URL: http://svn.freebsd.org/changeset/base/222199
Log:
Fix the zfs file system so that it uses the lock
flags argument added to VFS_FHTOVP() by r222167.
Reviewed by: pjd
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Sun May
22 20:55:54 2011 (r222198)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Sun May
22 21:04:32 2011 (r222199)
@@ -2069,7 +2069,7 @@ zfs_fhtovp(vfs_t *vfsp, fid_t *fidp, int
VN_HOLD(*vpp);
}
ZFS_EXIT(zfsvfs);
- err = zfs_vnode_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
+ err = zfs_vnode_lock(*vpp, flags | LK_RETRY);
if (err != 0)
*vpp = NULL;
return (err);
@@ -2096,7 +2096,7 @@ zfs_fhtovp(vfs_t *vfsp, fid_t *fidp, int
*vpp = ZTOV(zp);
ZFS_EXIT(zfsvfs);
- err = zfs_vnode_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
+ err = zfs_vnode_lock(*vpp, flags | LK_RETRY);
if (err == 0)
vnode_create_vobject(*vpp, zp->z_size, curthread);
else
_______________________________________________
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"
