---

yaml --- r: 296555 b: refs/heads/master c: ee4a3fc h: refs/heads/master i: 296553: 6b590e1 296551: cd469fe v: v3
git-mirror · Mar 2, 2012 · 3348b35 · 3348b35
1 parent 7081b35
commit 3348b35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87f26807e91102f2526d59c0232bf020479c8d0c
+refs/heads/master: ee4a3fcd1da660147624f13a9dc31d8bf43f5b06
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
@@ -1341,7 +1341,7 @@ enum {
 	Opt_data_err_abort, Opt_data_err_ignore,
 	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_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
 	Opt_usrquota, Opt_grpquota, Opt_i_version,
 	Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
 	Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
@@ -1784,8 +1784,6 @@ static int parse_options(char *options, struct super_block *sb,
 			else
 				clear_opt(sb, BARRIER);
 			break;
-		case Opt_ignore:
-			break;
 		case Opt_nobh:
 			ext4_msg(sb, KERN_WARNING,
 				 "Ignoring deprecated nobh option");