Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 3556e994 authored by Chengguang Xu's avatar Chengguang Xu Committed by Michael Bestas
Browse files

erofs: code cleanup by removing ifdef macro surrounding 



Define erofs_listxattr and erofs_xattr_handlers to NULL when
CONFIG_EROFS_FS_XATTR is not enabled, then we can remove many
ugly ifdef macros in the code.

Change-Id: Ie2276b888c74c3a1b8ddbcd14ac0d0e61499a508
Signed-off-by: default avatarChengguang Xu <cgxu519@mykernel.net>
Reviewed-by: default avatarGao Xiang <hsiangkao@redhat.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Link: https://lore.kernel.org/r/20200526090343.22794-1-cgxu519@mykernel.net


Signed-off-by: default avatarGao Xiang <hsiangkao@redhat.com>
parent 3f69c57d

fs/erofs/inode.c

+0 −6
Original line number Diff line number Diff line
@@ -356,27 +356,21 @@ int erofs_getattr(const struct path *path, struct kstat *stat, 


const struct inode_operations erofs_generic_iops = {

	.getattr = erofs_getattr,

#ifdef CONFIG_EROFS_FS_XATTR

	.listxattr = erofs_listxattr,

#endif

	.get_acl = erofs_get_acl,

};



const struct inode_operations erofs_symlink_iops = {

	.get_link = page_get_link,

	.getattr = erofs_getattr,

#ifdef CONFIG_EROFS_FS_XATTR

	.listxattr = erofs_listxattr,

#endif

	.get_acl = erofs_get_acl,

};



const struct inode_operations erofs_fast_symlink_iops = {

	.get_link = simple_get_link,

	.getattr = erofs_getattr,

#ifdef CONFIG_EROFS_FS_XATTR

	.listxattr = erofs_listxattr,

#endif

	.get_acl = erofs_get_acl,

};

fs/erofs/namei.c

+0 −2
Original line number Diff line number Diff line
@@ -244,9 +244,7 @@ static struct dentry *erofs_lookup(struct inode *dir, 
const struct inode_operations erofs_dir_iops = {

	.lookup = erofs_lookup,

	.getattr = erofs_getattr,

#ifdef CONFIG_EROFS_FS_XATTR

	.listxattr = erofs_listxattr,

#endif

	.get_acl = erofs_get_acl,

};

fs/erofs/super.c

+1 −3
Original line number Diff line number Diff line
@@ -408,10 +408,8 @@ static int erofs_fill_super(struct super_block *sb, void *data, int silent) 
	sb->s_time_gran = 1;



	sb->s_op = &erofs_sops;



#ifdef CONFIG_EROFS_FS_XATTR

	sb->s_xattr = erofs_xattr_handlers;

#endif



	/* set erofs default mount options */

	erofs_default_options(sbi);

fs/erofs/xattr.h

+2 −5
Original line number Diff line number Diff line
@@ -76,11 +76,8 @@ static inline int erofs_getxattr(struct inode *inode, int index, 
	return -EOPNOTSUPP;

}



static inline ssize_t erofs_listxattr(struct dentry *dentry,

				      char *buffer, size_t buffer_size)

{

	return -EOPNOTSUPP;

}

#define erofs_listxattr (NULL)

#define erofs_xattr_handlers (NULL)

#endif	/* !CONFIG_EROFS_FS_XATTR */



#ifdef CONFIG_EROFS_FS_POSIX_ACL