d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a fallout from the ZTOV tightening, r323479

Browse Source 
MFC after:	13 days
X-MFC with:	r323479
This commit is contained in:
Andriy Gapon 2017-09-12 13:21:14 +00:00
parent 69d14913fc
commit 1a2ddb2997
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
View File

@ -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);