Date: Sunday, February 26, 2012 @ 03:30:59 Author: tpowa Revision: 151391
add ext4 options patch Added: linux-lts/trunk/ext4-options.patch Modified: linux-lts/trunk/PKGBUILD --------------------+ PKGBUILD | 14 ++++++-------- ext4-options.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-02-26 08:18:31 UTC (rev 151390) +++ PKGBUILD 2012-02-26 08:30:59 UTC (rev 151391) @@ -21,14 +21,8 @@ # standard config files for mkinitcpio ramdisk "${pkgname}.preset" 'change-default-console-loglevel.patch' - 'i915-fix-ghost-tv-output.patch') -md5sums=('ecf932280e2441bdd992423ef3d55f8f' - '33197132ea106ea95dc6df731e7f8686' - 'bb2621878c5f9f32cc3c7da1e8e4a01b' - '2814ab5b626c10730433d8bc4938f50c' - '21a33df5fba2da2f56e447fb171f02c0' - '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5') + 'i915-fix-ghost-tv-output.patch' + 'ext4-options.patch') build() { cd "${srcdir}/linux-${_basekernel}" @@ -53,6 +47,10 @@ # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # fix ext4 module to mount ext3/2 correct + # https://bugs.archlinux.org/task/28653 + patch -Np1 -i "${srcdir}/ext4-options.patch" + if [ "${CARCH}" = "x86_64" ]; then cat "${srcdir}/config.x86_64" > ./.config else Added: ext4-options.patch =================================================================== --- ext4-options.patch (rev 0) +++ ext4-options.patch 2012-02-26 08:30:59 UTC (rev 151391) @@ -0,0 +1,49 @@ +Report: https://bbs.archlinux.org/profile.php?id=33804 +Signed-off-by: Tom Gundersen <t...@jklm.no> +Cc: Thomas Baechler <tho...@archlinux.org> +Cc: Tobias Powalowski <tobias.powalow...@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