Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix ACL build errors on sync with openzfs/master 

Signed-off-by: Ameer Hamza <ahamza@ixsystems.com>
This commit is contained in:
Ameer Hamza 2023-06-20 02:15:22 +05:00
parent d1df3f6cab
commit 44e8ea6a4a
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
module/os/linux/zfs/zfs_acl.c
View File

@ -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; for (aclnode = list_head(&aclp->z_acl); aclnode;
aclnode = list_next(&aclp->z_acl, aclnode)) { aclnode = list_next(&aclp->z_acl, aclnode)) {
bcopy(aclnode->z_acldata, start, memcpy(start, aclnode->z_acldata,
aclnode->z_size); aclnode->z_size);
start = (caddr_t)start + 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) if (mask == 0)
return (SET_ERROR(ENOSYS)); 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); return (error);
}
mutex_enter(&zp->z_acl_lock); mutex_enter(&zp->z_acl_lock);
error = zfs_getacl_impl(zp, vsecp, B_FALSE, cr); 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) if (zp->z_pflags & ZFS_IMMUTABLE)
return (SET_ERROR(EPERM)); 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); return (error);
}
mutex_enter(&zp->z_acl_lock); mutex_enter(&zp->z_acl_lock);
mutex_enter(&zp->z_lock); mutex_enter(&zp->z_lock);
@ -2270,15 +2274,19 @@ zfs_stripacl(znode_t *zp, cred_t *cr)
VSA_ACE_ACLFLAGS VSA_ACE_ACLFLAGS
}; };
ZFS_ENTER(zfsvfs); if ((error = zfs_enter(zfsvfs, FTAG)) != 0)
ZFS_VERIFY_ZP(zp); return (error);
if ((error = zfs_verify_zp(zp)) != 0)
goto done;
if (zp->z_pflags & ZFS_IMMUTABLE) { if (zp->z_pflags & ZFS_IMMUTABLE) {
error = SET_ERROR(EPERM); error = SET_ERROR(EPERM);
goto done; 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; goto done;
if (zp->z_pflags & ZFS_ACL_TRIVIAL) { 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); zil_commit(zfsvfs->z_log, 0);
done: done:
ZFS_EXIT(zfsvfs); zfs_exit(zfsvfs, FTAG);
return (error); return (error);
} }

4
module/os/linux/zfs/zpl_xattr.c
View File

@ -1852,9 +1852,11 @@ nfs4acl_get_out:
ZPL_XATTR_GET_WRAPPER(zpl_xattr_nfs41acl_get); ZPL_XATTR_GET_WRAPPER(zpl_xattr_nfs41acl_get);
static int 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) const void *value, size_t size, int flags)
{ {
(void) mnt_ns;
cred_t *cr = CRED(); cred_t *cr = CRED();
vsecattr_t vsecp; vsecattr_t vsecp;
char *bufp = NULL; char *bufp = NULL;