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

Commit 939da108 authored by Tao Ma's avatar Tao Ma Committed by Theodore Ts'o
Browse files

ext4: Remove CONFIG_EXT4_FS_XATTR 



Ted has sent out a RFC about removing this feature. Eric and Jan
confirmed that both RedHat and SUSE enable this feature in all their
product.  David also said that "As far as I know, it's enabled in all
Android kernels that use ext4."  So it seems OK for us.

And what's more, as inline data depends its implementation on xattr,
and to be frank, I don't run any test again inline data enabled while
xattr disabled.  So I think we should add inline data and remove this
config option in the same release.

[ The savings if you disable CONFIG_EXT4_FS_XATTR is only 27k, which
  isn't much in the grand scheme of things.  Since no one seems to be
  testing this configuration except for some automated compile farms, on
  balance we are better removing this config option, and so that it is
  effectively always enabled. -- tytso ]

Cc: David Brown <davidb@codeaurora.org>
Cc: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTao Ma <boyu.mt@taobao.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 187fd030

Documentation/filesystems/ext4.txt

+3 −6
Original line number Diff line number Diff line
@@ -200,12 +200,9 @@ inode_readahead_blks=n This tuning parameter controls the maximum 
			table readahead algorithm will pre-read into

			the buffer cache.  The default value is 32 blocks.



nouser_xattr		Disables Extended User Attributes. If you have extended

			attribute support enabled in the kernel configuration

			(CONFIG_EXT4_FS_XATTR), extended attribute support

			is enabled by default on mount. See the attr(5) manual

			page and http://acl.bestbits.at/ for more information

			about extended attributes.

nouser_xattr		Disables Extended User Attributes.  See the

			attr(5) manual page and http://acl.bestbits.at/

			for more information about extended attributes.



noacl			This option disables POSIX Access Control List

			support. If ACL support is enabled in the kernel

fs/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ config FS_MBCACHE 
	tristate

	default y if EXT2_FS=y && EXT2_FS_XATTR

	default y if EXT3_FS=y && EXT3_FS_XATTR

	default y if EXT4_FS=y && EXT4_FS_XATTR

	default m if EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR

	default y if EXT4_FS=y

	default m if EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS



source "fs/reiserfs/Kconfig"

source "fs/jfs/Kconfig"

fs/ext4/Kconfig

+0 −15
Original line number Diff line number Diff line
@@ -39,22 +39,8 @@ config EXT4_USE_FOR_EXT23 
	  compiled kernel size by using one file system driver for

	  ext2, ext3, and ext4 file systems.



config EXT4_FS_XATTR

	bool "Ext4 extended attributes"

	depends on EXT4_FS

	default y

	help

	  Extended attributes are name:value pairs associated with inodes by

	  the kernel or by users (see the attr(5) manual page, or visit

	  <http://acl.bestbits.at/> for details).



	  If unsure, say N.



	  You need this for POSIX ACL support on ext4.



config EXT4_FS_POSIX_ACL

	bool "Ext4 POSIX Access Control Lists"

	depends on EXT4_FS_XATTR

	select FS_POSIX_ACL

	help

	  POSIX Access Control Lists (ACLs) support permissions for users and
@@ -67,7 +53,6 @@ config EXT4_FS_POSIX_ACL 


config EXT4_FS_SECURITY

	bool "Ext4 Security Labels"

	depends on EXT4_FS_XATTR

	help

	  Security labels support alternative access control models

	  implemented by security modules like SELinux.  This option

fs/ext4/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ obj-$(CONFIG_EXT4_FS) += ext4.o 
ext4-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o page-io.o \

		ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \

		ext4_jbd2.o migrate.o mballoc.o block_validity.o move_extent.o \

		mmp.o indirect.o extents_status.o

		mmp.o indirect.o extents_status.o xattr.o xattr_user.o \

		xattr_trusted.o inline.o



ext4-$(CONFIG_EXT4_FS_XATTR)		+= xattr.o xattr_user.o xattr_trusted.o inline.o

ext4-$(CONFIG_EXT4_FS_POSIX_ACL)	+= acl.o

ext4-$(CONFIG_EXT4_FS_SECURITY)		+= xattr_security.o

fs/ext4/ext4.h

+0 −2
Original line number Diff line number Diff line
@@ -848,7 +848,6 @@ struct ext4_inode_info { 
#endif

	unsigned long	i_flags;



#ifdef CONFIG_EXT4_FS_XATTR

	/*

	 * Extended attributes can be read independently of the main file

	 * data. Taking i_mutex even when reading would cause contention
@@ -857,7 +856,6 @@ struct ext4_inode_info { 
	 * EAs.

	 */

	struct rw_semaphore xattr_sem;

#endif



	struct list_head i_orphan;	/* unlinked but open inodes */