diff --git a/module/os/linux/zfs/zfs_acl.c b/module/os/linux/zfs/zfs_acl.c
index 85269730a6..9127f79160 100644
--- a/module/os/linux/zfs/zfs_acl.c
+++ b/module/os/linux/zfs/zfs_acl.c
@@ -2039,7 +2039,7 @@ zfs_getacl_impl(znode_t *zp, vsecattr_t *vsecp, boolean_t stripped, cred_t *cr)
 
 			for (aclnode = list_head(&aclp->z_acl); aclnode;
 			    aclnode = list_next(&aclp->z_acl, aclnode)) {
-				bcopy(aclnode->z_acldata, start,
+				memcpy(start, aclnode->z_acldata,
 				    aclnode->z_size);
 				start = (caddr_t)start + aclnode->z_size;
 			}
@@ -2076,8 +2076,10 @@ zfs_getacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr)
 	if (mask == 0)
 		return (SET_ERROR(ENOSYS));
 
-	if ((error = zfs_zaccess(zp, ACE_READ_ACL, 0, skipaclchk, cr)))
+	if ((error = zfs_zaccess(zp, ACE_READ_ACL, 0, skipaclchk, cr,
+	    zfs_init_idmap))) {
 		return (error);
+	}
 
 	mutex_enter(&zp->z_acl_lock);
 	error  = zfs_getacl_impl(zp, vsecp, B_FALSE, cr);
@@ -2245,8 +2247,10 @@ zfs_setacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr)
 	if (zp->z_pflags & ZFS_IMMUTABLE)
 		return (SET_ERROR(EPERM));
 
-	if ((error = zfs_zaccess(zp, ACE_WRITE_ACL, 0, skipaclchk, cr)))
+	if ((error = zfs_zaccess(zp, ACE_WRITE_ACL, 0, skipaclchk, cr,
+	    zfs_init_idmap))) {
 		return (error);
+	}
 
 	mutex_enter(&zp->z_acl_lock);
 	mutex_enter(&zp->z_lock);
@@ -2270,15 +2274,19 @@ zfs_stripacl(znode_t *zp, cred_t *cr)
 		    VSA_ACE_ACLFLAGS
 	};
 
-	ZFS_ENTER(zfsvfs);
-	ZFS_VERIFY_ZP(zp);
+	if ((error = zfs_enter(zfsvfs, FTAG)) != 0)
+		return (error);
+
+	if ((error = zfs_verify_zp(zp)) != 0)
+		goto done;
 
 	if (zp->z_pflags & ZFS_IMMUTABLE) {
 		error = SET_ERROR(EPERM);
 		goto done;
 	}
 
-	if ((error = zfs_zaccess(zp, ACE_WRITE_ACL, 0, B_FALSE, cr)))
+	if ((error = zfs_zaccess(zp, ACE_WRITE_ACL, 0, B_FALSE, cr,
+	    zfs_init_idmap)))
 		goto done;
 
 	if (zp->z_pflags & ZFS_ACL_TRIVIAL) {
@@ -2307,7 +2315,7 @@ zfs_stripacl(znode_t *zp, cred_t *cr)
 		zil_commit(zfsvfs->z_log, 0);
 
 done:
-	ZFS_EXIT(zfsvfs);
+	zfs_exit(zfsvfs, FTAG);
 	return (error);
 }
 
diff --git a/module/os/linux/zfs/zpl_xattr.c b/module/os/linux/zfs/zpl_xattr.c
index beffa2f7ee..326c8215b8 100644
--- a/module/os/linux/zfs/zpl_xattr.c
+++ b/module/os/linux/zfs/zpl_xattr.c
@@ -1852,9 +1852,11 @@ nfs4acl_get_out:
 ZPL_XATTR_GET_WRAPPER(zpl_xattr_nfs41acl_get);
 
 static int
-__zpl_xattr_nfs41acl_set(struct inode *ip, const char *name,
+__zpl_xattr_nfs41acl_set(zidmap_t *mnt_ns,
+    struct inode *ip, const char *name,
     const void *value, size_t size, int flags)
 {
+	(void) mnt_ns;
 	cred_t *cr = CRED();
 	vsecattr_t vsecp;
 	char *bufp = NULL;