Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Chengguang Xu <cgxu519@mykernel.net>
To:     jack@suse.com
Cc:     linux-ext4@vger.kernel.org, Chengguang Xu <cgxu519@mykernel.net>
Message-ID: <20200522044035.24190-2-cgxu519@mykernel.net>
Subject: [PATCH 2/2] ext2: code cleanup by removing ifdef macro surrounding
Date:   Fri, 22 May 2020 12:40:35 +0800
In-Reply-To: <20200522044035.24190-1-cgxu519@mykernel.net>
References: <20200522044035.24190-1-cgxu519@mykernel.net>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf8
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk

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

Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
---
 fs/ext2/file.c    | 2 --
 fs/ext2/namei.c   | 4 ----
 fs/ext2/symlink.c | 4 ----
 fs/ext2/xattr.h   | 1 +
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/fs/ext2/file.c b/fs/ext2/file.c
index 39c4772e96c9..b4de9a0f170d 100644
--- a/fs/ext2/file.c
+++ b/fs/ext2/file.c
@@ -196,9 +196,7 @@ const struct file_operations ext2_file_operations =3D {
 };
=20
 const struct inode_operations ext2_file_inode_operations =3D {
-#ifdef CONFIG_EXT2_FS_XATTR
 =09.listxattr=09=3D ext2_listxattr,
-#endif
 =09.getattr=09=3D ext2_getattr,
 =09.setattr=09=3D ext2_setattr,
 =09.get_acl=09=3D ext2_get_acl,
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index 1a5421a34ef7..ba3e3e075891 100644
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -411,9 +411,7 @@ const struct inode_operations ext2_dir_inode_operations=
 =3D {
 =09.rmdir=09=09=3D ext2_rmdir,
 =09.mknod=09=09=3D ext2_mknod,
 =09.rename=09=09=3D ext2_rename,
-#ifdef CONFIG_EXT2_FS_XATTR
 =09.listxattr=09=3D ext2_listxattr,
-#endif
 =09.getattr=09=3D ext2_getattr,
 =09.setattr=09=3D ext2_setattr,
 =09.get_acl=09=3D ext2_get_acl,
@@ -422,9 +420,7 @@ const struct inode_operations ext2_dir_inode_operations=
 =3D {
 };
=20
 const struct inode_operations ext2_special_inode_operations =3D {
-#ifdef CONFIG_EXT2_FS_XATTR
 =09.listxattr=09=3D ext2_listxattr,
-#endif
 =09.getattr=09=3D ext2_getattr,
 =09.setattr=09=3D ext2_setattr,
 =09.get_acl=09=3D ext2_get_acl,
diff --git a/fs/ext2/symlink.c b/fs/ext2/symlink.c
index 00cdb8679486..948d3a441403 100644
--- a/fs/ext2/symlink.c
+++ b/fs/ext2/symlink.c
@@ -25,16 +25,12 @@ const struct inode_operations ext2_symlink_inode_operat=
ions =3D {
 =09.get_link=09=3D page_get_link,
 =09.getattr=09=3D ext2_getattr,
 =09.setattr=09=3D ext2_setattr,
-#ifdef CONFIG_EXT2_FS_XATTR
 =09.listxattr=09=3D ext2_listxattr,
-#endif
 };
 =20
 const struct inode_operations ext2_fast_symlink_inode_operations =3D {
 =09.get_link=09=3D simple_get_link,
 =09.getattr=09=3D ext2_getattr,
 =09.setattr=09=3D ext2_setattr,
-#ifdef CONFIG_EXT2_FS_XATTR
 =09.listxattr=09=3D ext2_listxattr,
-#endif
 };
diff --git a/fs/ext2/xattr.h b/fs/ext2/xattr.h
index 16272e6ddcf4..7925f596e8e2 100644
--- a/fs/ext2/xattr.h
+++ b/fs/ext2/xattr.h
@@ -100,6 +100,7 @@ static inline void ext2_xattr_destroy_cache(struct mb_c=
ache *cache)
 }
=20
 #define ext2_xattr_handlers NULL
+#define ext2_listxattr NULL
=20
 # endif  /* CONFIG_EXT2_FS_XATTR */
=20
--=20
2.20.1