diff options
author | Chengguang Xu <cgxu519@gmx.com> | 2018-06-07 22:53:40 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2018-06-20 05:04:26 -0400 |
commit | 27e6ed54a30a00d6520ddb4518214df8ff99daf1 (patch) | |
tree | 7938dfbd76d0b1a6218ad1b89bc9a4b28f6b244b /fs/ext2/super.c | |
parent | 1822193b5d4fd5d9800e6a7ed141375b8e8e68eb (diff) |
ext2: add warning when specifying nocheck option
The option nocheck(nocheck/check=none) is useless but considering
backwards compatibility it's better to print warning for a while
before completely remove from the code.
This patch add proper warning message for option 'nocheck' and
remove unnecessary comment/function declaration which is used for
removed option 'check'.
Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext2/super.c')
-rw-r--r-- | fs/ext2/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 25ab1274090f..8ff53f8da3bc 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
@@ -557,6 +557,9 @@ static int parse_options(char *options, struct super_block *sb, | |||
557 | set_opt (opts->s_mount_opt, NO_UID32); | 557 | set_opt (opts->s_mount_opt, NO_UID32); |
558 | break; | 558 | break; |
559 | case Opt_nocheck: | 559 | case Opt_nocheck: |
560 | ext2_msg(sb, KERN_WARNING, | ||
561 | "Option nocheck/check=none is deprecated and" | ||
562 | " will be removed in June 2020."); | ||
560 | clear_opt (opts->s_mount_opt, CHECK); | 563 | clear_opt (opts->s_mount_opt, CHECK); |
561 | break; | 564 | break; |
562 | case Opt_debug: | 565 | case Opt_debug: |
@@ -1335,9 +1338,6 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data) | |||
1335 | new_opts.s_resgid = sbi->s_resgid; | 1338 | new_opts.s_resgid = sbi->s_resgid; |
1336 | spin_unlock(&sbi->s_lock); | 1339 | spin_unlock(&sbi->s_lock); |
1337 | 1340 | ||
1338 | /* | ||
1339 | * Allow the "check" option to be passed as a remount option. | ||
1340 | */ | ||
1341 | if (!parse_options(data, sb, &new_opts)) | 1341 | if (!parse_options(data, sb, &new_opts)) |
1342 | return -EINVAL; | 1342 | return -EINVAL; |
1343 | 1343 | ||