diff options
| author | attilio <attilio@FreeBSD.org> | 2011-05-22 21:46:55 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2011-05-22 21:46:55 +0000 |
| commit | b580be6dfd3bce7b7a252cf3446d750faca58427 (patch) | |
| tree | 188b2a168ea3462b6b95f32d1e41893ed9699cd2 /sys/cddl | |
| parent | 627bd73cdb2acee5db84ea77c64c5b46decfe9bc (diff) | |
| download | FreeBSD-src-b580be6dfd3bce7b7a252cf3446d750faca58427.zip FreeBSD-src-b580be6dfd3bce7b7a252cf3446d750faca58427.tar.gz | |
MFC
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c | 4 |
1 files changed, 2 insertions, 2 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 85e3d44..fffc181 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 @@ -2069,7 +2069,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, 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 flags, vnode_t **vpp) *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 |
