d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC

Browse Source
This commit is contained in:
Attilio Rao 2011-05-22 21:46:55 +00:00
commit b97e49c0e1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
View File

@ -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

2
sys/ufs/ufs/ufs_vfsops.c
View File

@ -218,7 +218,7 @@ ufs_fhtovp(mp, ufhp, flags, vpp)
struct vnode *nvp;
int error;
error = VFS_VGET(mp, ufhp->ufid_ino, LK_EXCLUSIVE, &nvp);
error = VFS_VGET(mp, ufhp->ufid_ino, flags, &nvp);
if (error) {
*vpp = NULLVP;
return (error);