summaryrefslogtreecommitdiffstats
path: root/sys/cddl
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2012-11-25 15:07:27 +0000
committeravg <avg@FreeBSD.org>2012-11-25 15:07:27 +0000
commit45cac5be8a3800b819ee829ace85084735f04f63 (patch)
tree29e4fa484b9ef03741a1124a12054bc0ea119aed /sys/cddl
parent4addc9b82e8ad0afecb6580cd315dfaff630496f (diff)
downloadFreeBSD-src-45cac5be8a3800b819ee829ace85084735f04f63.zip
FreeBSD-src-45cac5be8a3800b819ee829ace85084735f04f63.tar.gz
zfs_fhtovp: there is no reason to amend lock flags with LK_RETRY here
MFC after: 12 days
Diffstat (limited to 'sys/cddl')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
index 2c7f423..b8f6774 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
@@ -2123,7 +2123,7 @@ zfs_fhtovp(vfs_t *vfsp, fid_t *fidp, int flags, vnode_t **vpp)
VN_HOLD(*vpp);
}
ZFS_EXIT(zfsvfs);
- err = zfs_vnode_lock(*vpp, flags | LK_RETRY);
+ err = zfs_vnode_lock(*vpp, flags);
if (err != 0)
*vpp = NULL;
return (err);
OpenPOWER on IntegriCloud