f2fs: code cleanup by removing ifdef macro surrounding

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

Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index f7de2a1da52830335fa06f64cf21946d618a6b3d..67fd1c900eb49ae98801e4c4a49b565ce69e4afb 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -979,9 +979,7 @@ const struct inode_operations f2fs_file_inode_operations = {
        .setattr        = f2fs_setattr,
        .get_acl        = f2fs_get_acl,
        .set_acl        = f2fs_set_acl,
-#ifdef CONFIG_F2FS_FS_XATTR
        .listxattr      = f2fs_listxattr,
-#endif
        .fiemap         = f2fs_fiemap,
 };
 

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 63b34a161cf48d3635c69432316fac4b12bba6b2..8f55201441f780fdb95e7a83c6aeb3cee8cbde26 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -1287,9 +1287,7 @@ const struct inode_operations f2fs_encrypted_symlink_inode_operations = {
        .get_link       = f2fs_encrypted_get_link,
        .getattr        = f2fs_getattr,
        .setattr        = f2fs_setattr,
-#ifdef CONFIG_F2FS_FS_XATTR
        .listxattr      = f2fs_listxattr,
-#endif
 };
 
 const struct inode_operations f2fs_dir_inode_operations = {
@@ -1307,9 +1305,7 @@ const struct inode_operations f2fs_dir_inode_operations = {
        .setattr        = f2fs_setattr,
        .get_acl        = f2fs_get_acl,
        .set_acl        = f2fs_set_acl,
-#ifdef CONFIG_F2FS_FS_XATTR
        .listxattr      = f2fs_listxattr,
-#endif
        .fiemap         = f2fs_fiemap,
 };
 
@@ -1317,9 +1313,7 @@ const struct inode_operations f2fs_symlink_inode_operations = {
        .get_link       = f2fs_get_link,
        .getattr        = f2fs_getattr,
        .setattr        = f2fs_setattr,
-#ifdef CONFIG_F2FS_FS_XATTR
        .listxattr      = f2fs_listxattr,
-#endif
 };
 
 const struct inode_operations f2fs_special_inode_operations = {
@@ -1327,7 +1321,5 @@ const struct inode_operations f2fs_special_inode_operations = {
        .setattr        = f2fs_setattr,
        .get_acl        = f2fs_get_acl,
        .set_acl        = f2fs_set_acl,
-#ifdef CONFIG_F2FS_FS_XATTR
        .listxattr      = f2fs_listxattr,
-#endif
 };

diff --git a/fs/f2fs/xattr.h b/fs/f2fs/xattr.h
index 6a192e6c7a9ebf90b0605c2087c6d59e4b4d678e..416d652774a33a39b06e9329535ac7c8e81ad0ca 100644 (file)
--- a/fs/f2fs/xattr.h
+++ b/fs/f2fs/xattr.h
@@ -136,6 +136,7 @@ extern void f2fs_destroy_xattr_caches(struct f2fs_sb_info *);
 #else
 
 #define f2fs_xattr_handlers    NULL
+#define f2fs_listxattr         NULL
 static inline int f2fs_setxattr(struct inode *inode, int index,
                const char *name, const void *value, size_t size,
                struct page *page, int flags)
@@ -148,11 +149,6 @@ static inline int f2fs_getxattr(struct inode *inode, int index,
 {
        return -EOPNOTSUPP;
 }
-static inline ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer,
-               size_t buffer_size)
-{
-       return -EOPNOTSUPP;
-}
 static inline int f2fs_init_xattr_caches(struct f2fs_sb_info *sbi) { return 0; }
 static inline void f2fs_destroy_xattr_caches(struct f2fs_sb_info *sbi) { }
 #endif