diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2011-05-22 21:04:32 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2011-05-22 21:04:32 +0000 |
| commit | 09babc9515c443ac19c880fe03eb9d50788f5bcc (patch) | |
| tree | a31312d8b77c5a61576c4cf3bbd142b3b50d4059 /sys/cddl | |
| parent | fc7af0ba5b07bb5d854b26307ba1a392a1a72326 (diff) | |
| download | FreeBSD-src-09babc9515c443ac19c880fe03eb9d50788f5bcc.zip FreeBSD-src-09babc9515c443ac19c880fe03eb9d50788f5bcc.tar.gz | |
Fix the zfs file system so that it uses the lock
flags argument added to VFS_FHTOVP() by r222167.
Reviewed by: pjd
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 |
