UBIFS: remove xattr Kconnfig option

Remove CONFIG_UBIFS_FS_XATTR configuration option and associated
UBIFS_FS_XATTR ifdefs.

Testing:
       Tested using integck while using nandsim on x86 & MX28 based
       platform with Micron MT29F2G08ABAEAH4 nand.

Signed-off-by: Subodh Nijsure <snijsure@grid-net.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index f8b0160da2da8be993d8fe93c246c9bdd1dd35aa..e49a23ca117a8acf986a3f2cb9a2dbe39332c65f 100644 (file)
--- a/fs/ubifs/Kconfig
+++ b/fs/ubifs/Kconfig
@@ -11,12 +11,6 @@ config UBIFS_FS
        help
          UBIFS is a file system for flash devices which works on top of UBI.
 
-config UBIFS_FS_XATTR
-       bool "Extended attributes support"
-       depends on UBIFS_FS
-       help
-         This option enables support of extended attributes.
-
 config UBIFS_FS_ADVANCED_COMPR
        bool "Advanced compression options"
        depends on UBIFS_FS

diff --git a/fs/ubifs/Makefile b/fs/ubifs/Makefile
index 80e93c35e49672e03996a7b3135c48379b36a4d6..4878614d06f96f9ae60d6e47e2106bd95413d1b9 100644 (file)
--- a/fs/ubifs/Makefile
+++ b/fs/ubifs/Makefile
@@ -3,7 +3,6 @@ obj-$(CONFIG_UBIFS_FS) += ubifs.o
 ubifs-y += shrinker.o journal.o file.o dir.o super.o sb.o io.o
 ubifs-y += tnc.o master.o scan.o replay.o log.o commit.o gc.o orphan.o
 ubifs-y += budget.o find.o tnc_commit.o compress.o lpt.o lprops.o
-ubifs-y += recovery.o ioctl.o lpt_commit.o tnc_misc.o
+ubifs-y += recovery.o ioctl.o lpt_commit.o tnc_misc.o xattr.o
 
 ubifs-$(CONFIG_UBIFS_FS_DEBUG) += debug.o
-ubifs-$(CONFIG_UBIFS_FS_XATTR) += xattr.o

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index ec9f1870ab7f083d1a9c5084ad3cbf8110259754..ad6e550acdc0c48625508a7e252bf9b705628947 100644 (file)
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -1187,12 +1187,10 @@ const struct inode_operations ubifs_dir_inode_operations = {
        .rename      = ubifs_rename,
        .setattr     = ubifs_setattr,
        .getattr     = ubifs_getattr,
-#ifdef CONFIG_UBIFS_FS_XATTR
        .setxattr    = ubifs_setxattr,
        .getxattr    = ubifs_getxattr,
        .listxattr   = ubifs_listxattr,
        .removexattr = ubifs_removexattr,
-#endif
 };
 
 const struct file_operations ubifs_dir_operations = {

diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 5c8f6dc1d28bfdc978a552dc0689b71d15256b7b..0fe640cc872a1cadc91fdf7fb82b24dcf6cc2bfa 100644 (file)
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1562,12 +1562,10 @@ const struct address_space_operations ubifs_file_address_operations = {
 const struct inode_operations ubifs_file_inode_operations = {
        .setattr     = ubifs_setattr,
        .getattr     = ubifs_getattr,
-#ifdef CONFIG_UBIFS_FS_XATTR
        .setxattr    = ubifs_setxattr,
        .getxattr    = ubifs_getxattr,
        .listxattr   = ubifs_listxattr,
        .removexattr = ubifs_removexattr,
-#endif
 };
 
 const struct inode_operations ubifs_symlink_inode_operations = {

diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c
index 2f438ab2e7a2730f2dfff7498ad8c3301f425479..bc75e9dfab92870e27467943bb663308b52b4520 100644 (file)
--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
@@ -1267,7 +1267,6 @@ out_free:
        return err;
 }
 
-#ifdef CONFIG_UBIFS_FS_XATTR
 
 /**
  * ubifs_jnl_delete_xattr - delete an extended attribute.
@@ -1462,4 +1461,3 @@ out_free:
        return err;
 }
 
-#endif /* CONFIG_UBIFS_FS_XATTR */