summaryrefslogtreecommitdiffstats
path: root/sys/cddl
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2009-09-13 10:29:51 +0000
committerpjd <pjd@FreeBSD.org>2009-09-13 10:29:51 +0000
commit2dcef8ae2ba607af0ecf73abc909344f5d23a167 (patch)
tree43accdc54c1f03c093d1d5314308e25286f2f18f /sys/cddl
parent876ea5bb9d5e000364130e211ff97537810eaedf (diff)
downloadFreeBSD-src-2dcef8ae2ba607af0ecf73abc909344f5d23a167.zip
FreeBSD-src-2dcef8ae2ba607af0ecf73abc909344f5d23a167.tar.gz
Extend scope of the z_teardown_lock lock for consistency and "just in case".
MFC after: 3 days
Diffstat (limited to 'sys/cddl')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c5
1 files changed, 3 insertions, 2 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 6bea810..175e63e 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
@@ -1185,8 +1185,6 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
}
}
- ZFS_EXIT(zfsvfs);
-
/* Translate errors and add SAVENAME when needed. */
if (cnp->cn_flags & ISLASTCN) {
switch (nameiop) {
@@ -1217,6 +1215,7 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
if (error != 0) {
VN_RELE(*vpp);
*vpp = NULL;
+ ZFS_EXIT(zfsvfs);
return (error);
}
}
@@ -1238,6 +1237,8 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
}
#endif
+ ZFS_EXIT(zfsvfs);
+
return (error);
}
OpenPOWER on IntegriCloud