aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r--fs/ext4/super.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index e1e216f8e9bd..7d53adff8bd3 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -997,9 +997,7 @@ static void init_once(void *foo)
997 struct ext4_inode_info *ei = (struct ext4_inode_info *) foo; 997 struct ext4_inode_info *ei = (struct ext4_inode_info *) foo;
998 998
999 INIT_LIST_HEAD(&ei->i_orphan); 999 INIT_LIST_HEAD(&ei->i_orphan);
1000#ifdef CONFIG_EXT4_FS_XATTR
1001 init_rwsem(&ei->xattr_sem); 1000 init_rwsem(&ei->xattr_sem);
1002#endif
1003 init_rwsem(&ei->i_data_sem); 1001 init_rwsem(&ei->i_data_sem);
1004 inode_init_once(&ei->vfs_inode); 1002 inode_init_once(&ei->vfs_inode);
1005} 1003}
@@ -1449,13 +1447,8 @@ static const struct mount_opts {
1449 {Opt_data_journal, EXT4_MOUNT_JOURNAL_DATA, MOPT_DATAJ}, 1447 {Opt_data_journal, EXT4_MOUNT_JOURNAL_DATA, MOPT_DATAJ},
1450 {Opt_data_ordered, EXT4_MOUNT_ORDERED_DATA, MOPT_DATAJ}, 1448 {Opt_data_ordered, EXT4_MOUNT_ORDERED_DATA, MOPT_DATAJ},
1451 {Opt_data_writeback, EXT4_MOUNT_WRITEBACK_DATA, MOPT_DATAJ}, 1449 {Opt_data_writeback, EXT4_MOUNT_WRITEBACK_DATA, MOPT_DATAJ},
1452#ifdef CONFIG_EXT4_FS_XATTR
1453 {Opt_user_xattr, EXT4_MOUNT_XATTR_USER, MOPT_SET}, 1450 {Opt_user_xattr, EXT4_MOUNT_XATTR_USER, MOPT_SET},
1454 {Opt_nouser_xattr, EXT4_MOUNT_XATTR_USER, MOPT_CLEAR}, 1451 {Opt_nouser_xattr, EXT4_MOUNT_XATTR_USER, MOPT_CLEAR},
1455#else
1456 {Opt_user_xattr, 0, MOPT_NOSUPPORT},
1457 {Opt_nouser_xattr, 0, MOPT_NOSUPPORT},
1458#endif
1459#ifdef CONFIG_EXT4_FS_POSIX_ACL 1452#ifdef CONFIG_EXT4_FS_POSIX_ACL
1460 {Opt_acl, EXT4_MOUNT_POSIX_ACL, MOPT_SET}, 1453 {Opt_acl, EXT4_MOUNT_POSIX_ACL, MOPT_SET},
1461 {Opt_noacl, EXT4_MOUNT_POSIX_ACL, MOPT_CLEAR}, 1454 {Opt_noacl, EXT4_MOUNT_POSIX_ACL, MOPT_CLEAR},
@@ -3368,9 +3361,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
3368 if (def_mount_opts & EXT4_DEFM_UID16) 3361 if (def_mount_opts & EXT4_DEFM_UID16)
3369 set_opt(sb, NO_UID32); 3362 set_opt(sb, NO_UID32);
3370 /* xattr user namespace & acls are now defaulted on */ 3363 /* xattr user namespace & acls are now defaulted on */
3371#ifdef CONFIG_EXT4_FS_XATTR
3372 set_opt(sb, XATTR_USER); 3364 set_opt(sb, XATTR_USER);
3373#endif
3374#ifdef CONFIG_EXT4_FS_POSIX_ACL 3365#ifdef CONFIG_EXT4_FS_POSIX_ACL
3375 set_opt(sb, POSIX_ACL); 3366 set_opt(sb, POSIX_ACL);
3376#endif 3367#endif