summaryrefslogtreecommitdiffstats
path: root/fs/ext2/super.c
diff options
context:
space:
mode:
authorChengguang Xu2018-06-08 04:53:40 +0200
committerJan Kara2018-06-20 11:04:26 +0200
commit27e6ed54a30a00d6520ddb4518214df8ff99daf1 (patch)
tree7938dfbd76d0b1a6218ad1b89bc9a4b28f6b244b /fs/ext2/super.c
parentquota: Cleanup list iteration in dqcache_shrink_scan() (diff)
downloadkernel-qcow2-linux-27e6ed54a30a00d6520ddb4518214df8ff99daf1.tar.gz
kernel-qcow2-linux-27e6ed54a30a00d6520ddb4518214df8ff99daf1.tar.xz
kernel-qcow2-linux-27e6ed54a30a00d6520ddb4518214df8ff99daf1.zip
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.c6
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,
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:
@@ -1335,9 +1338,6 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
new_opts.s_resgid = sbi->s_resgid;
spin_unlock(&sbi->s_lock);
- /*
- * Allow the "check" option to be passed as a remount option.
- */
if (!parse_options(data, sb, &new_opts))
return -EINVAL;