diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-02-06 11:55:48 -0200 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-02-06 11:55:48 -0200 |
| commit | ce15c219696194cd6826205cb630e64cfb9c1c5b (patch) | |
| tree | d59fd775358e09bf90d842203d3f751c97b1f75a /kernels/linux-libre-aufs_friendly/ext4-options.patch | |
| parent | 387a6ac962ce6a21ccb27fa2cc494ea6e3d2b8cd (diff) | |
| parent | c1bff90faaaca75404032580f2ad5213ec76e893 (diff) | |
| download | abslibre-ce15c219696194cd6826205cb630e64cfb9c1c5b.tar.gz abslibre-ce15c219696194cd6826205cb630e64cfb9c1c5b.tar.bz2 abslibre-ce15c219696194cd6826205cb630e64cfb9c1c5b.zip | |
Merge ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'kernels/linux-libre-aufs_friendly/ext4-options.patch')
| -rw-r--r-- | kernels/linux-libre-aufs_friendly/ext4-options.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/kernels/linux-libre-aufs_friendly/ext4-options.patch b/kernels/linux-libre-aufs_friendly/ext4-options.patch deleted file mode 100644 index ea48c384b..000000000 --- a/kernels/linux-libre-aufs_friendly/ext4-options.patch +++ /dev/null @@ -1,50 +0,0 @@ -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\" " - |