summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/fs/zfs/dsl_deleg.c
diff options
context:
space:
mode:
authorJustin Gibbs <justing@spectralogic.com>2015-01-05 19:27:09 -0500
committerDan McDonald <danmcd@omniti.com>2015-01-06 00:13:32 -0500
commitbc9014e6a81272073b9854d9f65dd59e18d18c35 (patch)
tree3d2031a48e13fc414f10f516a943cc23d88886d6 /usr/src/uts/common/fs/zfs/dsl_deleg.c
parentad69a33458cf73ee14857d57799cf686946e0b88 (diff)
downloadillumos-joyent-bc9014e6a81272073b9854d9f65dd59e18d18c35.tar.gz
5056 ZFS deadlock on db_mtx and dn_holds
Reviewed by: Will Andrews <willa@spectralogic.com> Reviewed by: Matt Ahrens <mahrens@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src/uts/common/fs/zfs/dsl_deleg.c')
-rw-r--r--usr/src/uts/common/fs/zfs/dsl_deleg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_deleg.c b/usr/src/uts/common/fs/zfs/dsl_deleg.c
index dc405ebe58..32fe03803f 100644
--- a/usr/src/uts/common/fs/zfs/dsl_deleg.c
+++ b/usr/src/uts/common/fs/zfs/dsl_deleg.c
@@ -561,7 +561,7 @@ dsl_deleg_access_impl(dsl_dataset_t *ds, const char *perm, cred_t *cr)
SPA_VERSION_DELEGATED_PERMS)
return (SET_ERROR(EPERM));
- if (dsl_dataset_is_snapshot(ds)) {
+ if (ds->ds_is_snapshot) {
/*
* Snapshots are treated as descendents only,
* local permissions do not apply.