diff options
| author | Coleman Kane <[email protected]> | 2023-01-24 14:20:50 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-01-24 11:20:50 -0800 |
| commit | 9cd71c8604d52def22ffaddc35755712f0fb9349 (patch) | |
| tree | e30c63a663662e7837f51defeba904ba47bb1a2b /include | |
| parent | 0f740a4f1dd444fb961e9070a3eb5d3bc68a03b3 (diff) | |
linux 6.2 compat: zpl_set_acl arg2 is now struct dentry
Linux 6.2 changes the second argument of the set_acl operation to be a
"struct dentry *" rather than a "struct inode *". The inode* parameter
is still available as dentry->d_inode, so adjust the call to the _impl
function call to dereference and pass that pointer to it.
Also document that the get_acl -> get_inode_acl member name change from
commit 884a693 was an API change also introduced in Linux 6.2.
Reviewed-by: Tony Hutter <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Richard Yao <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #14415
Diffstat (limited to 'include')
| -rw-r--r-- | include/os/linux/zfs/sys/zpl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/os/linux/zfs/sys/zpl.h b/include/os/linux/zfs/sys/zpl.h index f499c04dd..ac1f01a86 100644 --- a/include/os/linux/zfs/sys/zpl.h +++ b/include/os/linux/zfs/sys/zpl.h @@ -71,6 +71,9 @@ extern int zpl_xattr_security_init(struct inode *ip, struct inode *dip, #if defined(HAVE_SET_ACL_USERNS) extern int zpl_set_acl(struct user_namespace *userns, struct inode *ip, struct posix_acl *acl, int type); +#elif defined(HAVE_SET_ACL_USERNS_DENTRY_ARG2) +extern int zpl_set_acl(struct user_namespace *userns, struct dentry *dentry, + struct posix_acl *acl, int type); #else extern int zpl_set_acl(struct inode *ip, struct posix_acl *acl, int type); #endif /* HAVE_SET_ACL_USERNS */ |