aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMichael Gernoth <michael@gernoth.net>2015-10-13 13:31:46 +0200
committerrogersb11 <brettrogers11@gmail.com>2015-12-02 12:47:41 -0500
commitda99a783dea556ffa9ee86f1b9fd9e037f449f6a (patch)
treeba7bd3605cd000d2bed9b537949ccc3e9bf1cd28 /fs
parent94327c078ea9c1d1620b86b95d7ae8dbd1add014 (diff)
downloadkernel_samsung_smdk4412-da99a783dea556ffa9ee86f1b9fd9e037f449f6a.tar.gz
kernel_samsung_smdk4412-da99a783dea556ffa9ee86f1b9fd9e037f449f6a.tar.bz2
kernel_samsung_smdk4412-da99a783dea556ffa9ee86f1b9fd9e037f449f6a.zip
ext3: ignore ext4-option nomblk_io_submit
Change-Id: I7b85e62f61aafbb5d46f8a049ffbeea021346353
Diffstat (limited to 'fs')
-rw-r--r--fs/ext3/super.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index ba57a63cfbc..c5a670e598a 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -821,7 +821,7 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err,
- Opt_resize, Opt_usrquota, Opt_grpquota
+ Opt_resize, Opt_usrquota, Opt_grpquota, Opt_nomblk_io_submit
};
static const match_table_t tokens = {
@@ -878,6 +878,7 @@ static const match_table_t tokens = {
{Opt_barrier, "barrier"},
{Opt_nobarrier, "nobarrier"},
{Opt_resize, "resize"},
+ {Opt_nomblk_io_submit, "nomblk_io_submit"},
{Opt_err, NULL},
};
@@ -1266,6 +1267,10 @@ set_qf_format:
ext3_msg(sb, KERN_WARNING,
"warning: ignoring deprecated bh option");
break;
+ case Opt_nomblk_io_submit:
+ ext3_msg(sb, KERN_WARNING,
+ "warning: ignoring ext4 option nomblk_io_submit");
+ break;
default:
ext3_msg(sb, KERN_ERR,
"error: unrecognized mount option \"%s\" "