Commit ded53656 authored by Yang Xu's avatar Yang Xu Committed by Miklos Szeredi
Browse files

ovl: improve ovl_get_acl() if POSIX ACL support is off 



Provide a proper stub for the !CONFIG_FS_POSIX_ACL case.

Signed-off-by: default avatarYang Xu <xuyang2018.jy@fujitsu.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 9c5dd803

fs/overlayfs/inode.c

+3 −1
Original line number Diff line number Diff line
@@ -454,13 +454,14 @@ ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size) 
	return res;

}



#ifdef CONFIG_FS_POSIX_ACL

struct posix_acl *ovl_get_acl(struct inode *inode, int type, bool rcu)

{

	struct inode *realinode = ovl_inode_real(inode);

	const struct cred *old_cred;

	struct posix_acl *acl;



	if (!IS_ENABLED(CONFIG_FS_POSIX_ACL) || !IS_POSIXACL(realinode))

	if (!IS_POSIXACL(realinode))

		return NULL;



	if (rcu)
@@ -472,6 +473,7 @@ struct posix_acl *ovl_get_acl(struct inode *inode, int type, bool rcu) 


	return acl;

}

#endif



int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags)

{

fs/overlayfs/overlayfs.h

+6 −0
Original line number Diff line number Diff line
@@ -599,7 +599,13 @@ int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char *name, 
int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const char *name,

		  void *value, size_t size);

ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);



#ifdef CONFIG_FS_POSIX_ACL

struct posix_acl *ovl_get_acl(struct inode *inode, int type, bool rcu);

#else

#define ovl_get_acl	NULL

#endif



int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags);

bool ovl_is_private_xattr(struct super_block *sb, const char *name);