Skip to content

Commit 01436ef

Browse files
committed
ext4: Remove unused mount options: nomballoc, mballoc, nocheck
These mount options don't actually do anything any more, so remove them. Signed-off-by: "Theodore Ts'o" <[email protected]>
1 parent 0b09923 commit 01436ef

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

fs/ext4/ext4.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,6 @@ do { \
511511
/*
512512
* Mount flags
513513
*/
514-
#define EXT4_MOUNT_CHECK 0x00001 /* Do mount-time checks */
515514
#define EXT4_MOUNT_OLDALLOC 0x00002 /* Don't use the new Orlov allocator */
516515
#define EXT4_MOUNT_GRPID 0x00004 /* Create files with directory's group */
517516
#define EXT4_MOUNT_DEBUG 0x00008 /* Some debugging messages */

fs/ext4/super.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ static const struct export_operations ext4_export_ops = {
904904
enum {
905905
Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid,
906906
Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic, Opt_err_ro,
907-
Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov,
907+
Opt_nouid32, Opt_debug, Opt_oldalloc, Opt_orlov,
908908
Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl,
909909
Opt_reservation, Opt_noreservation, Opt_noload, Opt_nobh, Opt_bh,
910910
Opt_commit, Opt_journal_update, Opt_journal_inum, Opt_journal_dev,
@@ -915,7 +915,7 @@ enum {
915915
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
916916
Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
917917
Opt_grpquota, Opt_extents, Opt_noextents, Opt_i_version,
918-
Opt_mballoc, Opt_nomballoc, Opt_stripe, Opt_delalloc, Opt_nodelalloc,
918+
Opt_stripe, Opt_delalloc, Opt_nodelalloc,
919919
Opt_inode_readahead_blks
920920
};
921921

@@ -933,8 +933,6 @@ static const match_table_t tokens = {
933933
{Opt_err_panic, "errors=panic"},
934934
{Opt_err_ro, "errors=remount-ro"},
935935
{Opt_nouid32, "nouid32"},
936-
{Opt_nocheck, "nocheck"},
937-
{Opt_nocheck, "check=none"},
938936
{Opt_debug, "debug"},
939937
{Opt_oldalloc, "oldalloc"},
940938
{Opt_orlov, "orlov"},
@@ -973,8 +971,6 @@ static const match_table_t tokens = {
973971
{Opt_extents, "extents"},
974972
{Opt_noextents, "noextents"},
975973
{Opt_i_version, "i_version"},
976-
{Opt_mballoc, "mballoc"},
977-
{Opt_nomballoc, "nomballoc"},
978974
{Opt_stripe, "stripe=%u"},
979975
{Opt_resize, "resize"},
980976
{Opt_delalloc, "delalloc"},
@@ -1073,9 +1069,6 @@ static int parse_options(char *options, struct super_block *sb,
10731069
case Opt_nouid32:
10741070
set_opt(sbi->s_mount_opt, NO_UID32);
10751071
break;
1076-
case Opt_nocheck:
1077-
clear_opt(sbi->s_mount_opt, CHECK);
1078-
break;
10791072
case Opt_debug:
10801073
set_opt(sbi->s_mount_opt, DEBUG);
10811074
break;

0 commit comments

Comments
 (0)