summaryrefslogtreecommitdiffstats
path: root/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2013-08-23 14:40:09 +0000
committeravg <avg@FreeBSD.org>2013-08-23 14:40:09 +0000
commite1e1d4dae6c7063d4a6e8ef3564f3bfd3344be77 (patch)
tree82c8cfe3497916ab895f7ecf128aaed4217be7ea /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
parent9e74434e9250dbdfb3b9f71d6371507b4186018e (diff)
downloadFreeBSD-src-e1e1d4dae6c7063d4a6e8ef3564f3bfd3344be77.zip
FreeBSD-src-e1e1d4dae6c7063d4a6e8ef3564f3bfd3344be77.tar.gz
zfs: inline and remove zfs_vnode_lock
It didn't serve any useful purpose, but obscured file and line information useful for debugging. MFC after: 5 days X-MFC with: r254445
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
index 770c07a..a23dd0d 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
@@ -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) {
OpenPOWER on IntegriCloud