Author: avg
Date: Tue Sep 12 13:21:14 2017
New Revision: 323491
URL: https://svnweb.freebsd.org/changeset/base/323491
Log:
fix a fallout from the ZTOV tightening, r323479
MFC after: 13 days
X-MFC with: r323479
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Tue Sep
12 10:43:02 2017 (r323490)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Tue Sep
12 13:21:14 2017 (r323491)
@@ -1602,7 +1602,10 @@ zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *va
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);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
