Commit 1a338506 authored by Yang Xu's avatar Yang Xu Committed by Dave Chinner
Browse files

xfs: improve __xfs_set_acl 



Provide a proper stub for the !CONFIG_XFS_POSIX_ACL case.

Also use a easy way for xfs_get_acl stub.

Suggested-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
Signed-off-by: default avatarYang Xu <xuyang2018.jy@fujitsu.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent ce522ba9

fs/xfs/xfs_acl.h

+5 −3
Original line number Diff line number Diff line
@@ -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)

{

}

fs/xfs/xfs_iops.c

+0 −2
Original line number Diff line number Diff line
@@ -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);