diff options
author | Subodh Nijsure <subodh.nijsure@gmail.com> | 2012-04-14 12:09:57 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-05-03 07:11:11 -0400 |
commit | 1bdcc63112a0fe10030abee6ad71aaecd091e68e (patch) | |
tree | 0fa4760bfed47a315b4d4291438b8865c06fc5c1 /fs/ubifs | |
parent | 273946a5c507ff5bce12349143470e8629bbe0a7 (diff) |
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>
Diffstat (limited to 'fs/ubifs')
-rw-r--r-- | fs/ubifs/Kconfig | 6 | ||||
-rw-r--r-- | fs/ubifs/Makefile | 3 | ||||
-rw-r--r-- | fs/ubifs/dir.c | 2 | ||||
-rw-r--r-- | fs/ubifs/file.c | 2 | ||||
-rw-r--r-- | fs/ubifs/journal.c | 2 |
5 files changed, 1 insertions, 14 deletions
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig index f8b0160da2da..e49a23ca117a 100644 --- a/fs/ubifs/Kconfig +++ b/fs/ubifs/Kconfig | |||
@@ -11,12 +11,6 @@ config UBIFS_FS | |||
11 | help | 11 | help |
12 | UBIFS is a file system for flash devices which works on top of UBI. | 12 | UBIFS is a file system for flash devices which works on top of UBI. |
13 | 13 | ||
14 | config UBIFS_FS_XATTR | ||
15 | bool "Extended attributes support" | ||
16 | depends on UBIFS_FS | ||
17 | help | ||
18 | This option enables support of extended attributes. | ||
19 | |||
20 | config UBIFS_FS_ADVANCED_COMPR | 14 | config UBIFS_FS_ADVANCED_COMPR |
21 | bool "Advanced compression options" | 15 | bool "Advanced compression options" |
22 | depends on UBIFS_FS | 16 | depends on UBIFS_FS |
diff --git a/fs/ubifs/Makefile b/fs/ubifs/Makefile index 80e93c35e496..4878614d06f9 100644 --- a/fs/ubifs/Makefile +++ b/fs/ubifs/Makefile | |||
@@ -3,7 +3,6 @@ obj-$(CONFIG_UBIFS_FS) += ubifs.o | |||
3 | ubifs-y += shrinker.o journal.o file.o dir.o super.o sb.o io.o | 3 | ubifs-y += shrinker.o journal.o file.o dir.o super.o sb.o io.o |
4 | ubifs-y += tnc.o master.o scan.o replay.o log.o commit.o gc.o orphan.o | 4 | ubifs-y += tnc.o master.o scan.o replay.o log.o commit.o gc.o orphan.o |
5 | ubifs-y += budget.o find.o tnc_commit.o compress.o lpt.o lprops.o | 5 | ubifs-y += budget.o find.o tnc_commit.o compress.o lpt.o lprops.o |
6 | ubifs-y += recovery.o ioctl.o lpt_commit.o tnc_misc.o | 6 | ubifs-y += recovery.o ioctl.o lpt_commit.o tnc_misc.o xattr.o |
7 | 7 | ||
8 | ubifs-$(CONFIG_UBIFS_FS_DEBUG) += debug.o | 8 | ubifs-$(CONFIG_UBIFS_FS_DEBUG) += debug.o |
9 | ubifs-$(CONFIG_UBIFS_FS_XATTR) += xattr.o | ||
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index ec9f1870ab7f..ad6e550acdc0 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c | |||
@@ -1187,12 +1187,10 @@ const struct inode_operations ubifs_dir_inode_operations = { | |||
1187 | .rename = ubifs_rename, | 1187 | .rename = ubifs_rename, |
1188 | .setattr = ubifs_setattr, | 1188 | .setattr = ubifs_setattr, |
1189 | .getattr = ubifs_getattr, | 1189 | .getattr = ubifs_getattr, |
1190 | #ifdef CONFIG_UBIFS_FS_XATTR | ||
1191 | .setxattr = ubifs_setxattr, | 1190 | .setxattr = ubifs_setxattr, |
1192 | .getxattr = ubifs_getxattr, | 1191 | .getxattr = ubifs_getxattr, |
1193 | .listxattr = ubifs_listxattr, | 1192 | .listxattr = ubifs_listxattr, |
1194 | .removexattr = ubifs_removexattr, | 1193 | .removexattr = ubifs_removexattr, |
1195 | #endif | ||
1196 | }; | 1194 | }; |
1197 | 1195 | ||
1198 | const struct file_operations ubifs_dir_operations = { | 1196 | const struct file_operations ubifs_dir_operations = { |
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index 5c8f6dc1d28b..0fe640cc872a 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c | |||
@@ -1562,12 +1562,10 @@ const struct address_space_operations ubifs_file_address_operations = { | |||
1562 | const struct inode_operations ubifs_file_inode_operations = { | 1562 | const struct inode_operations ubifs_file_inode_operations = { |
1563 | .setattr = ubifs_setattr, | 1563 | .setattr = ubifs_setattr, |
1564 | .getattr = ubifs_getattr, | 1564 | .getattr = ubifs_getattr, |
1565 | #ifdef CONFIG_UBIFS_FS_XATTR | ||
1566 | .setxattr = ubifs_setxattr, | 1565 | .setxattr = ubifs_setxattr, |
1567 | .getxattr = ubifs_getxattr, | 1566 | .getxattr = ubifs_getxattr, |
1568 | .listxattr = ubifs_listxattr, | 1567 | .listxattr = ubifs_listxattr, |
1569 | .removexattr = ubifs_removexattr, | 1568 | .removexattr = ubifs_removexattr, |
1570 | #endif | ||
1571 | }; | 1569 | }; |
1572 | 1570 | ||
1573 | const struct inode_operations ubifs_symlink_inode_operations = { | 1571 | const struct inode_operations ubifs_symlink_inode_operations = { |
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 2f438ab2e7a2..bc75e9dfab92 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c | |||
@@ -1267,7 +1267,6 @@ out_free: | |||
1267 | return err; | 1267 | return err; |
1268 | } | 1268 | } |
1269 | 1269 | ||
1270 | #ifdef CONFIG_UBIFS_FS_XATTR | ||
1271 | 1270 | ||
1272 | /** | 1271 | /** |
1273 | * ubifs_jnl_delete_xattr - delete an extended attribute. | 1272 | * ubifs_jnl_delete_xattr - delete an extended attribute. |
@@ -1462,4 +1461,3 @@ out_free: | |||
1462 | return err; | 1461 | return err; |
1463 | } | 1462 | } |
1464 | 1463 | ||
1465 | #endif /* CONFIG_UBIFS_FS_XATTR */ | ||