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

zfs: inline and remove zfs_vnode_lock

Browse Source 
It didn't serve any useful purpose, but obscured file and line information
useful for debugging.

MFC after:	5 days
X-MFC with:	r254445
This commit is contained in:
avg 2013-08-23 14:40:09 +00:00
parent 9e74434e92
commit e1e1d4dae6
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
View File

@ -156,7 +156,6 @@ extern int zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers);
extern int zfsvfs_create(const char *name, zfsvfs_t **zfvp);
extern void zfsvfs_free(zfsvfs_t *zfsvfs);
extern int zfs_check_global_label(const char *dsname, const char *hexsl);
extern int zfs_vnode_lock(vnode_t *vp, int flags);
#ifdef _KERNEL
extern void zfsvfs_update_fromname(const char *oldname, const char *newname);

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

@ -1796,15 +1796,6 @@ zfs_statfs(vfs_t *vfsp, struct statfs *statp)
return (0);
}
int
zfs_vnode_lock(vnode_t *vp, int flags)
{
ASSERT(vp != NULL);
return (vn_lock(vp, flags));
}
static int
zfs_root(vfs_t *vfsp, int flags, vnode_t **vpp)
{
@ -1821,7 +1812,7 @@ zfs_root(vfs_t *vfsp, int flags, vnode_t **vpp)
ZFS_EXIT(zfsvfs);
if (error == 0) {
error = zfs_vnode_lock(*vpp, flags);
error = vn_lock(*vpp, flags);
if (error == 0)
(*vpp)->v_vflag |= VV_ROOT;
}
@ -2082,7 +2073,7 @@ zfs_vget(vfs_t *vfsp, ino_t ino, int flags, vnode_t **vpp)
*vpp = ZTOV(zp);
ZFS_EXIT(zfsvfs);
if (err == 0)
err = zfs_vnode_lock(*vpp, flags);
err = vn_lock(*vpp, flags);
if (err != 0)
*vpp = NULL;
else
@ -2181,7 +2172,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);
err = vn_lock(*vpp, flags);
if (err != 0)
*vpp = NULL;
return (err);
@ -2208,7 +2199,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, flags | LK_RETRY);
err = vn_lock(*vpp, flags | LK_RETRY);
if (err == 0)
vnode_create_vobject(*vpp, zp->z_size, curthread);
else

2
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
View File

@ -1526,7 +1526,7 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
VOP_UNLOCK(dvp, 0);
}
ZFS_EXIT(zfsvfs);
error = zfs_vnode_lock(*vpp, cnp->cn_lkflags);
error = vn_lock(*vpp, cnp->cn_lkflags);
if (cnp->cn_flags & ISDOTDOT)
vn_lock(dvp, ltype | LK_RETRY);
if (error != 0) {