[PATCH] remove CONFIG_EXT{2,3}_CHECK
The CONFIG_EXT{2,3}_CHECK options where were never available, and all they did was to implement a subset of e2fsck in the kernel. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
0ad74ffa90
commit
2860b733f1
@ -281,7 +281,7 @@ static unsigned long get_sb_block(void **data)
|
||||
enum {
|
||||
Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid,
|
||||
Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic,
|
||||
Opt_err_ro, Opt_nouid32, Opt_check, Opt_nocheck, Opt_debug,
|
||||
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
|
||||
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
|
||||
Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
|
||||
Opt_usrquota, Opt_grpquota
|
||||
@ -303,7 +303,6 @@ static match_table_t tokens = {
|
||||
{Opt_nouid32, "nouid32"},
|
||||
{Opt_nocheck, "check=none"},
|
||||
{Opt_nocheck, "nocheck"},
|
||||
{Opt_check, "check"},
|
||||
{Opt_debug, "debug"},
|
||||
{Opt_oldalloc, "oldalloc"},
|
||||
{Opt_orlov, "orlov"},
|
||||
@ -376,13 +375,6 @@ static int parse_options (char * options,
|
||||
case Opt_nouid32:
|
||||
set_opt (sbi->s_mount_opt, NO_UID32);
|
||||
break;
|
||||
case Opt_check:
|
||||
#ifdef CONFIG_EXT2_CHECK
|
||||
set_opt (sbi->s_mount_opt, CHECK);
|
||||
#else
|
||||
printk("EXT2 Check option not supported\n");
|
||||
#endif
|
||||
break;
|
||||
case Opt_nocheck:
|
||||
clear_opt (sbi->s_mount_opt, CHECK);
|
||||
break;
|
||||
@ -503,12 +495,6 @@ static int ext2_setup_super (struct super_block * sb,
|
||||
EXT2_BLOCKS_PER_GROUP(sb),
|
||||
EXT2_INODES_PER_GROUP(sb),
|
||||
sbi->s_mount_opt);
|
||||
#ifdef CONFIG_EXT2_CHECK
|
||||
if (test_opt (sb, CHECK)) {
|
||||
ext2_check_blocks_bitmap (sb);
|
||||
ext2_check_inodes_bitmap (sb);
|
||||
}
|
||||
#endif
|
||||
return res;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user