Commit 30b42a71 authored by Chengguang Xu's avatar Chengguang Xu Committed by Jan Kara
Browse files

ext2: remove nocheck option 

Remove useless nocheck option.

Link: https://lore.kernel.org/r/20200619073144.4701-1-cgxu519@mykernel.net


Signed-off-by: default avatarChengguang Xu <cgxu519@mykernel.net>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent bc2fbaa4

fs/ext2/ext2.h

+0 −1
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ struct ext2_inode { 
/*

 * Mount flags

 */

#define EXT2_MOUNT_CHECK		0x000001  /* Do mount-time checks */

#define EXT2_MOUNT_OLDALLOC		0x000002  /* Don't use the new Orlov allocator */

#define EXT2_MOUNT_GRPID		0x000004  /* Create files with directory's group */

#define EXT2_MOUNT_DEBUG		0x000008  /* Some debugging messages */

fs/ext2/super.c

+1 −9
Original line number Diff line number Diff line
@@ -431,7 +431,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_nocheck, Opt_debug,

	Opt_err_ro, Opt_nouid32, Opt_debug,

	Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,

	Opt_acl, Opt_noacl, Opt_xip, Opt_dax, Opt_ignore, Opt_err, Opt_quota,

	Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation
@@ -451,8 +451,6 @@ static const match_table_t tokens = { 
	{Opt_err_panic, "errors=panic"},

	{Opt_err_ro, "errors=remount-ro"},

	{Opt_nouid32, "nouid32"},

	{Opt_nocheck, "check=none"},

	{Opt_nocheck, "nocheck"},

	{Opt_debug, "debug"},

	{Opt_oldalloc, "oldalloc"},

	{Opt_orlov, "orlov"},
@@ -546,12 +544,6 @@ static int parse_options(char *options, struct super_block *sb, 
		case Opt_nouid32:

			set_opt (opts->s_mount_opt, NO_UID32);

			break;

		case Opt_nocheck:

			ext2_msg(sb, KERN_WARNING,

				"Option nocheck/check=none is deprecated and"

				" will be removed in June 2020.");

			clear_opt (opts->s_mount_opt, CHECK);

			break;

		case Opt_debug:

			set_opt (opts->s_mount_opt, DEBUG);

			break;