diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2017-09-12 13:21:14 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2017-09-12 13:21:14 +0000 |
| commit | 1a2ddb29975c8578f78485478fea70e7c37c4f2e (patch) | |
| tree | 9ce069b3953dbafb37c118f8c06c13e0633696c5 /sys/cddl | |
| parent | 69d14913fc7c96d67fe4da67ba8388d0007c5240 (diff) | |
| download | src-test2-1a2ddb29975c8578f78485478fea70e7c37c4f2e.tar.gz src-test2-1a2ddb29975c8578f78485478fea70e7c37c4f2e.zip | |
Notes
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c index 1a9f0d47f3db..e98731442c8e 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c @@ -1602,7 +1602,10 @@ zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *vap, cred_t *cr, boolean_t trim = B_FALSE; boolean_t inherited = B_FALSE; - ASSERT_VOP_ELOCKED(ZTOV(dzp), __func__); + if ((flag & IS_ROOT_NODE) == 0) + ASSERT_VOP_ELOCKED(ZTOV(dzp), __func__); + else + ASSERT(dzp->z_vnode == NULL); bzero(acl_ids, sizeof (zfs_acl_ids_t)); acl_ids->z_mode = MAKEIMODE(vap->va_type, vap->va_mode); |