From: akpm@linux-foundation.org Subject: - ext3-retry-block-allocation-if-new-blocks-are-allocated-from-system-zone.patch removed from -mm tree Date: Mon, 28 Apr 2008 15:00:55 -0700 Message-ID: <200804282200.m3SM0tgl018789@imap1.linux-foundation.org> To: aneesh.kumar@linux.vnet.ibm.com, linux-ext4@vger.kernel.org, mm-commits@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:45527 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965808AbYD1WBt (ORCPT ); Mon, 28 Apr 2008 18:01:49 -0400 Sender: linux-ext4-owner@vger.kernel.org List-ID: The patch titled ext3: retry block allocation if new blocks are allocated from system zone has been removed from the -mm tree. Its filename was ext3-retry-block-allocation-if-new-blocks-are-allocated-from-system-zone.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ext3: retry block allocation if new blocks are allocated from system zone From: "Aneesh Kumar K.V" If the block allocator gets blocks out of system zone ext3 calls ext3_error. But if the file system is mounted with errors=continue retry block allocation. We need to mark the system zone blocks as in use to make sure retry don't pick them again System zone is the block range mapping block bitmap, inode bitmap and inode table. [akpm@linux-foundation.org: fix typo in comment] Signed-off-by: Aneesh Kumar K.V Cc: Signed-off-by: Andrew Morton --- fs/ext3/balloc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff -puN fs/ext3/balloc.c~ext3-retry-block-allocation-if-new-blocks-are-allocated-from-system-zone fs/ext3/balloc.c --- a/fs/ext3/balloc.c~ext3-retry-block-allocation-if-new-blocks-are-allocated-from-system-zone +++ a/fs/ext3/balloc.c @@ -164,10 +164,11 @@ read_block_bitmap(struct super_block *sb block_group, le32_to_cpu(desc->bg_block_bitmap)); return NULL; } - if (!ext3_valid_block_bitmap(sb, desc, block_group, bh)) { - brelse(bh); - return NULL; - } + ext3_valid_block_bitmap(sb, desc, block_group, bh); + /* + * file system mounted not to panic on error, continue with corrupt + * bitmap + */ return bh; } /* @@ -1641,7 +1642,11 @@ allocated: "Allocating block in system zone - " "blocks from "E3FSBLK", length %lu", ret_block, num); - goto out; + /* + * claim_block() marked the blocks we allocated as in use. So we + * may want to selectively mark some of the blocks as free. + */ + goto retry_alloc; } performed_allocation = 1; _ Patches currently in -mm which might be from aneesh.kumar@linux.vnet.ibm.com are origin.patch