ext4: enable acls and user_xattr by default (ea663336) · Commits · 戴 / test

There's no good reason to require the extra step of providing a mount option for acl or user_xattr once the feature is configured on; no other filesystem that I know of requires this. Userspace patches have set these options in default mount options, and this patch makes them default in the kernel. At some point we can start to deprecate the options, perhaps. For now I've removed default mount option checks in show_options() to be explicit about what's set, since it's changing the default, but I'm open to alternatives if desired. Signed-off-by:

Eric Sandeen <sandeen@redhat.com> Signed-off-by:

"Theodore Ts'o" <tytso@mit.edu>

fs/ext4/super.c

+5 −9

Original line number	Diff line number	Diff line
		@@ -997,13 +997,10 @@ static int ext4_show_options(struct seq_file seq, struct vfsmount vfs)
		if (test_opt(sb, OLDALLOC))
		seq_puts(seq, ",oldalloc");
		#ifdef CONFIG_EXT4_FS_XATTR
		if (test_opt(sb, XATTR_USER) &&
		!(def_mount_opts & EXT4_DEFM_XATTR_USER))
		if (test_opt(sb, XATTR_USER))
		seq_puts(seq, ",user_xattr");
		if (!test_opt(sb, XATTR_USER) &&
		(def_mount_opts & EXT4_DEFM_XATTR_USER)) {
		if (!test_opt(sb, XATTR_USER))
		seq_puts(seq, ",nouser_xattr");
		}
		#endif
		#ifdef CONFIG_EXT4_FS_POSIX_ACL
		if (test_opt(sb, POSIX_ACL) && !(def_mount_opts & EXT4_DEFM_ACL))
		@@ -3095,12 +3092,11 @@ static int ext4_fill_super(struct super_block sb, void data, int silent)
		}
		if (def_mount_opts & EXT4_DEFM_UID16)
		set_opt(sb, NO_UID32);
		/* xattr user namespace & acls are now defaulted on */
		#ifdef CONFIG_EXT4_FS_XATTR
		if (def_mount_opts & EXT4_DEFM_XATTR_USER)
		set_opt(sb, XATTR_USER);
		#endif
		#ifdef CONFIG_EXT4_FS_POSIX_ACL
		if (def_mount_opts & EXT4_DEFM_ACL)
		set_opt(sb, POSIX_ACL);
		#endif
		if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_DATA)

Admin message