summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/fs/zfs/dsl_pool.c
diff options
context:
space:
mode:
authorArne Jansen <jansen@webgods.de>2015-06-12 15:14:13 +0200
committerRobert Mustacchi <rm@joyent.com>2015-06-20 01:04:51 -0700
commit1d3f896f5469c69c1339890ec3d68e9feddb0343 (patch)
tree1629e8103e1ba5a55f168c536227767e889c761e /usr/src/uts/common/fs/zfs/dsl_pool.c
parent6203546182f592d62b0fb7f4182da3d21d59031f (diff)
downloadillumos-joyent-1d3f896f5469c69c1339890ec3d68e9feddb0343.tar.gz
5981 Deadlock in dmu_objset_find_dp
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Dan McDonald <danmcd@omniti.com> Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/uts/common/fs/zfs/dsl_pool.c')
-rw-r--r--usr/src/uts/common/fs/zfs/dsl_pool.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_pool.c b/usr/src/uts/common/fs/zfs/dsl_pool.c
index 8c5d820ede..ddd8e73447 100644
--- a/usr/src/uts/common/fs/zfs/dsl_pool.c
+++ b/usr/src/uts/common/fs/zfs/dsl_pool.c
@@ -1046,6 +1046,13 @@ dsl_pool_config_enter(dsl_pool_t *dp, void *tag)
}
void
+dsl_pool_config_enter_prio(dsl_pool_t *dp, void *tag)
+{
+ ASSERT(!rrw_held(&dp->dp_config_rwlock, RW_READER));
+ rrw_enter_read_prio(&dp->dp_config_rwlock, tag);
+}
+
+void
dsl_pool_config_exit(dsl_pool_t *dp, void *tag)
{
rrw_exit(&dp->dp_config_rwlock, tag);