On Thu, Apr 21, 2022 at 04:54:50PM +0800, Yang Xu wrote:
> Provide a proper stub for the !CONFIG_XFS_POSIX_ACL case.
>
> Also use a easy way for xfs_get_acl stub.
>
> Suggested-by: Christian Brauner (Microsoft) <brauner@xxxxxxxxxx>
> Signed-off-by: Yang Xu <xuyang2018.jy@xxxxxxxxxxx>
Seems reasonable to me.
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_acl.h | 8 +++++---
> fs/xfs/xfs_iops.c | 2 --
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h
> index bb6abdcb265d..263404d0bfda 100644
> --- a/fs/xfs/xfs_acl.h
> +++ b/fs/xfs/xfs_acl.h
> @@ -16,11 +16,13 @@ extern int xfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
> extern int __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type);
> void xfs_forget_acl(struct inode *inode, const char *name);
> #else
> -static inline struct posix_acl *xfs_get_acl(struct inode *inode, int type, bool rcu)
> +#define xfs_get_acl NULL
> +#define xfs_set_acl NULL
> +static inline int __xfs_set_acl(struct inode *inode, struct posix_acl *acl,
> + int type)
> {
> - return NULL;
> + return 0;
> }
> -# define xfs_set_acl NULL
> static inline void xfs_forget_acl(struct inode *inode, const char *name)
> {
> }
> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
> index b34e8e4344a8..94313b7e9991 100644
> --- a/fs/xfs/xfs_iops.c
> +++ b/fs/xfs/xfs_iops.c
> @@ -209,7 +209,6 @@ xfs_generic_create(
> if (unlikely(error))
> goto out_cleanup_inode;
>
> -#ifdef CONFIG_XFS_POSIX_ACL
> if (default_acl) {
> error = __xfs_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);
> if (error)
> @@ -220,7 +219,6 @@ xfs_generic_create(
> if (error)
> goto out_cleanup_inode;
> }
> -#endif
>
> xfs_setup_iops(ip);
>
> --
> 2.27.0
>
