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

Commit 1bdcc631 authored by Subodh Nijsure's avatar Subodh Nijsure Committed by Artem Bityutskiy
Browse files

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: default avatarSubodh Nijsure <snijsure@grid-net.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 273946a5

fs/ubifs/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -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

fs/ubifs/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -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

fs/ubifs/dir.c

+0 −2
Original line number Diff line number Diff line
@@ -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 = {

fs/ubifs/file.c

+0 −2
Original line number Diff line number Diff line
@@ -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 = {

fs/ubifs/journal.c

+0 −2
Original line number Diff line number Diff line
@@ -1267,7 +1267,6 @@ int ubifs_jnl_truncate(struct ubifs_info *c, const struct inode *inode, 
	return err;

}



#ifdef CONFIG_UBIFS_FS_XATTR



/**

 * ubifs_jnl_delete_xattr - delete an extended attribute.
@@ -1462,4 +1461,3 @@ int ubifs_jnl_change_xattr(struct ubifs_info *c, const struct inode *inode, 
	return err;

}

#endif /* CONFIG_UBIFS_FS_XATTR */