diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-08 10:11:38 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-08 10:11:38 +0100 |
| commit | d2800e9cfd6bb876f597adbb806de21774067413 (patch) | |
| tree | 5236f073d5af51d5060a46d09884a55b36ea3440 /fs/ext3/super.c | |
| parent | 3fe26611bb4999c3717d3aface0bac722b9d2653 (diff) | |
| parent | afabf37012e839802f9f3819f621e16aa4acefd2 (diff) | |
| download | kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.zip kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.tar.gz kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.tar.bz2 | |
Merge commit 'afabf37012e839802f9f3819f621e16aa4acefd2' into upstreaming
update from cm-13.0
Conflicts:
Makefile
crypto/algapi.c
drivers/char/diag/diagchar.h
drivers/char/diag/diagchar_core.c
drivers/misc/Makefile
kernel/timeconst.pl
Diffstat (limited to 'fs/ext3/super.c')
| -rw-r--r-- | fs/ext3/super.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index ba57a63..c5a670e 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\" " |