summaryrefslogtreecommitdiff
path: root/libre/linux-libre-lts/ext4-options.patch
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-03-01 15:14:35 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-03-01 15:14:35 -0300
commit69b78ed95efd699c0dfbe588457234eee3ae9d9c (patch)
tree15b1c2902f0c430d015c9fc70ec7db6c042528f7 /libre/linux-libre-lts/ext4-options.patch
parentd7d39087e97e5a5ff1ab2c40db618934633b594c (diff)
parentb5ef7ef5b393a1862d781791b9aa998d20636f59 (diff)
downloadabslibre-69b78ed95efd699c0dfbe588457234eee3ae9d9c.tar.gz
abslibre-69b78ed95efd699c0dfbe588457234eee3ae9d9c.tar.bz2
abslibre-69b78ed95efd699c0dfbe588457234eee3ae9d9c.zip
Merge branch 'master' of ssh://gparabola/abslibre
Diffstat (limited to 'libre/linux-libre-lts/ext4-options.patch')
-rw-r--r--libre/linux-libre-lts/ext4-options.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/libre/linux-libre-lts/ext4-options.patch b/libre/linux-libre-lts/ext4-options.patch
new file mode 100644
index 000000000..4aa23fdef
--- /dev/null
+++ b/libre/linux-libre-lts/ext4-options.patch
@@ -0,0 +1,49 @@
+Report: https://bbs.archlinux.org/profile.php?id=33804
+Signed-off-by: Tom Gundersen <teg@jklm.no>
+Cc: Thomas Baechler <thomas@archlinux.org>
+Cc: Tobias Powalowski <tobias.powalowski@googlemail.com>
+Cc: Dave Reisner <d@falconindy.com>
+---
+ fs/ext4/super.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 502c61f..30de9cd 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -1333,6 +1333,7 @@ enum {
+ Opt_inode_readahead_blks, Opt_journal_ioprio,
+ Opt_dioread_nolock, Opt_dioread_lock,
+ Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
++ Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum,
+ };
+
+ static const match_table_t tokens = {
+@@ -1408,6 +1409,10 @@ static const match_table_t tokens = {
+ {Opt_init_itable, "init_itable=%u"},
+ {Opt_init_itable, "init_itable"},
+ {Opt_noinit_itable, "noinit_itable"},
++ {Opt_nocheck, "nocheck"},
++ {Opt_reservation, "reservation"},
++ {Opt_noreservation, "noreservation"},
++ {Opt_journal_inum, "journal=%u"},
+ {Opt_err, NULL},
+ };
+
+@@ -1904,6 +1909,16 @@ set_qf_format:
+ case Opt_noinit_itable:
+ clear_opt(sb, INIT_INODE_TABLE);
+ break;
++#ifdef CONFIG_EXT4_USE_FOR_EXT23
++ case Opt_nocheck:
++ case Opt_reservation:
++ case Opt_noreservation:
++ case Opt_journal_inum:
++ ext4_msg(sb, KERN_WARNING,
++ "ext3 mount option \"%s\" ignored "
++ "by ext4 module", p);
++ break;
++#endif
+ default:
+ ext4_msg(sb, KERN_ERR,
+ "Unrecognized mount option \"%s\" " \ No newline at end of file