From: Subject: patch ext4-do-mballoc-init-before-doing-filesystem-recovery.patch added to 2.6.27-stable tree Date: Wed, 03 Dec 2008 10:55:51 -0800 Message-ID: <20081203185916.4B74949043@coco.kroah.org> References: <1226851540-8032-14-git-send-email-tytso@mit.edu> Cc: , To: aneesh.kumar@linux.vnet.ibm.com, gregkh@suse.de, linux-ext4@vger.kernel.org, tytso@mit.edu Return-path: Received: from kroah.org ([198.145.64.141]:60905 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751659AbYLCS7R (ORCPT ); Wed, 3 Dec 2008 13:59:17 -0500 In-Reply-To: <1226851540-8032-14-git-send-email-tytso@mit.edu> Sender: linux-ext4-owner@vger.kernel.org List-ID: This is a note to let you know that we have just queued up the patch titled Subject: ext4: Do mballoc init before doing filesystem recovery to the 2.6.27-stable tree. Its filename is ext4-do-mballoc-init-before-doing-filesystem-recovery.patch A git repo of this tree can be found at http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary >From tytso@mit.edu Wed Dec 3 10:42:48 2008 From: Aneesh Kumar K.V Date: Sun, 16 Nov 2008 11:05:33 -0500 Subject: ext4: Do mballoc init before doing filesystem recovery To: stable@kernel.org Cc: Ext4 Developers List , "Theodore Ts'o" , "Aneesh Kumar K.V" Message-ID: <1226851540-8032-14-git-send-email-tytso@mit.edu> From: Aneesh Kumar K.V (cherry picked from commit c2774d84fd6cab2bfa2a2fae0b1ca8d8ebde48a2) During filesystem recovery we may be doing a truncate which expects some of the mballoc data structures to be initialized. So do ext4_mb_init before recovery. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/ext4/super.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -2449,6 +2449,21 @@ static int ext4_fill_super(struct super_ "available.\n"); } + if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA) { + printk(KERN_WARNING "EXT4-fs: Ignoring delalloc option - " + "requested data journaling mode\n"); + clear_opt(sbi->s_mount_opt, DELALLOC); + } else if (test_opt(sb, DELALLOC)) + printk(KERN_INFO "EXT4-fs: delayed allocation enabled\n"); + + ext4_ext_init(sb); + err = ext4_mb_init(sb, needs_recovery); + if (err) { + printk(KERN_ERR "EXT4-fs: failed to initalize mballoc (%d)\n", + err); + goto failed_mount4; + } + /* * akpm: core read_super() calls in here with the superblock locked. * That deadlocks, because orphan cleanup needs to lock the superblock @@ -2468,16 +2483,6 @@ static int ext4_fill_super(struct super_ test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_ORDERED_DATA ? "ordered": "writeback"); - if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA) { - printk(KERN_WARNING "EXT4-fs: Ignoring delalloc option - " - "requested data journaling mode\n"); - clear_opt(sbi->s_mount_opt, DELALLOC); - } else if (test_opt(sb, DELALLOC)) - printk(KERN_INFO "EXT4-fs: delayed allocation enabled\n"); - - ext4_ext_init(sb); - ext4_mb_init(sb, needs_recovery);