diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2018-07-02 11:14:50 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2018-07-02 11:14:50 -0600 |
| commit | 5f6654094ff35a7a92eb76667788ef633595e4ea (patch) | |
| tree | 8404c5fb245cddbc6877b97a9bf53139c95da852 /fs/ext2/super.c | |
| parent | 5105730fbf6789ff9e20837bdefe32e8ba133595 (diff) | |
| parent | 021c91791a5e7e85c567452f1be3e4c2c6cb6063 (diff) | |
| download | kernel_replicant_linux-5f6654094ff35a7a92eb76667788ef633595e4ea.tar.gz kernel_replicant_linux-5f6654094ff35a7a92eb76667788ef633595e4ea.tar.bz2 kernel_replicant_linux-5f6654094ff35a7a92eb76667788ef633595e4ea.zip | |
Merge tag 'v4.18-rc3' into docs-next
-rc1 broke the docs build due to changes in the e100/e1000 drivers; -rc3
got the fixes via the networking tree. Pull in -rc3 so that the docs tree
can actually build the docs again.
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, 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; |