From 87e64de96f565827f052b7ea22f3c47d8761219f Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 4 Mar 2012 22:00:53 -0500 Subject: [PATCH] --- yaml --- r: 296563 b: refs/heads/master c: c7198b9c1e4520d3b16f0f65e37d3db78745f1e1 h: refs/heads/master i: 296561: 0b108011d21e3691874d27e74ea90627e7b38f32 296559: f41d4873f26e2715253d372243e6d8c4f16d2883 v: v3 --- [refs] | 2 +- trunk/fs/ext4/super.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e511bb13612a..edd716061a1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66acdcf4ea37f67e59a955509289e82e5f59a5d0 +refs/heads/master: c7198b9c1e4520d3b16f0f65e37d3db78745f1e1 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index 27d490d6eb02..960681fae64e 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -1249,6 +1249,11 @@ static const match_table_t tokens = { {Opt_init_itable, "init_itable=%u"}, {Opt_init_itable, "init_itable"}, {Opt_noinit_itable, "noinit_itable"}, + {Opt_removed, "check=none"}, /* mount option from ext2/3 */ + {Opt_removed, "nocheck"}, /* mount option from ext2/3 */ + {Opt_removed, "reservation"}, /* mount option from ext2/3 */ + {Opt_removed, "noreservation"}, /* mount option from ext2/3 */ + {Opt_removed, "journal=%u"}, /* mount option from ext2/3 */ {Opt_err, NULL}, };