diff options
| author | Matthew Macy <[email protected]> | 2019-11-01 10:19:11 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-11-01 10:19:11 -0700 |
| commit | 156f74fc03d6187017a695c6c84a03f650f626b4 (patch) | |
| tree | c8fb31d19f5a4330f2e2709ae9c78fac5218e99a | |
| parent | c4ae27c763acc2b29747e98a4318be9516c43e70 (diff) | |
Return an error code from zfs_acl_chmod_setattr
The FreeBSD implementation can fail, allow this function to
fail and add the required error handling for Linux.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #9541
| -rw-r--r-- | include/sys/zfs_acl.h | 2 | ||||
| -rw-r--r-- | module/os/linux/zfs/zfs_acl.c | 4 | ||||
| -rw-r--r-- | module/os/linux/zfs/zfs_vnops.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/include/sys/zfs_acl.h b/include/sys/zfs_acl.h index 747f4e57e..010686a91 100644 --- a/include/sys/zfs_acl.h +++ b/include/sys/zfs_acl.h @@ -220,7 +220,7 @@ int zfs_fastaccesschk_execute(struct znode *, cred_t *); extern int zfs_zaccess_rwx(struct znode *, mode_t, int, cred_t *); extern int zfs_zaccess_unix(struct znode *, mode_t, cred_t *); extern int zfs_acl_access(struct znode *, int, cred_t *); -void zfs_acl_chmod_setattr(struct znode *, zfs_acl_t **, uint64_t); +int zfs_acl_chmod_setattr(struct znode *, zfs_acl_t **, uint64_t); int zfs_zaccess_delete(struct znode *, struct znode *, cred_t *); int zfs_zaccess_rename(struct znode *, struct znode *, struct znode *, struct znode *, cred_t *cr); diff --git a/module/os/linux/zfs/zfs_acl.c b/module/os/linux/zfs/zfs_acl.c index b53bd3556..67efee175 100644 --- a/module/os/linux/zfs/zfs_acl.c +++ b/module/os/linux/zfs/zfs_acl.c @@ -1570,7 +1570,7 @@ zfs_acl_chmod(zfsvfs_t *zfsvfs, uint64_t mode, zfs_acl_t *aclp) list_insert_tail(&aclp->z_acl, newnode); } -void +int zfs_acl_chmod_setattr(znode_t *zp, zfs_acl_t **aclp, uint64_t mode) { mutex_enter(&zp->z_acl_lock); @@ -1581,6 +1581,8 @@ zfs_acl_chmod_setattr(znode_t *zp, zfs_acl_t **aclp, uint64_t mode) mutex_exit(&zp->z_lock); mutex_exit(&zp->z_acl_lock); ASSERT(*aclp); + + return (0); } /* diff --git a/module/os/linux/zfs/zfs_vnops.c b/module/os/linux/zfs/zfs_vnops.c index 03a8c4a50..41da7378b 100644 --- a/module/os/linux/zfs/zfs_vnops.c +++ b/module/os/linux/zfs/zfs_vnops.c @@ -3252,7 +3252,8 @@ top: uint64_t acl_obj; new_mode = (pmode & S_IFMT) | (vap->va_mode & ~S_IFMT); - zfs_acl_chmod_setattr(zp, &aclp, new_mode); + if ((err = zfs_acl_chmod_setattr(zp, &aclp, new_mode))) + goto out; mutex_enter(&zp->z_lock); if (!zp->z_is_sa && ((acl_obj = zfs_external_acl(zp)) != 0)) { |