2008-04-28 22:00:51

by Andrew Morton

[permalink] [raw]
Subject: - ext2-retry-block-allocation-if-new-blocks-are-allocated-from-system-zone.patch removed from -mm tree

The patch titled
ext2: retry block allocation if new blocks are allocated from system zone
has been removed from the -mm tree. Its filename was

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: ext2: retry block allocation if new blocks are allocated from system zone
From: "Aneesh Kumar K.V" <[email protected]>

If the block allocator gets blocks out of system zone ext2 calls ext2_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

[[email protected]: fix typo in comment]
Signed-off-by: Aneesh Kumar K.V <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

fs/ext2/balloc.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)

diff -puN fs/ext2/balloc.c~ext2-retry-block-allocation-if-new-blocks-are-allocated-from-system-zone fs/ext2/balloc.c
--- a/fs/ext2/balloc.c~ext2-retry-block-allocation-if-new-blocks-are-allocated-from-system-zone
+++ a/fs/ext2/balloc.c
@@ -149,11 +149,12 @@ read_block_bitmap(struct super_block *sb
block_group, le32_to_cpu(desc->bg_block_bitmap));
return NULL;
- if (!ext2_valid_block_bitmap(sb, desc, block_group, bh)) {
- brelse(bh);
- return NULL;
- }

+ ext2_valid_block_bitmap(sb, desc, block_group, bh);
+ /*
+ * file system mounted not to panic on error, continue with corrupt
+ * bitmap
+ */
return bh;

@@ -1380,7 +1381,12 @@ allocated:
"Allocating block in system zone - "
"blocks from "E2FSBLK", length %lu",
ret_block, num);
- goto out;
+ /*
+ * ext2_try_to_allocate 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 [email protected] are