2008-04-10 15:50:27

by Aneesh Kumar K.V

Subject: [PATCH] ext2: Retry block allocation if new blocks are allocated from system zone.

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 table.

Signed-off-by: Aneesh Kumar K.V <[email protected]>
---
fs/ext2/balloc.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index e7b2baf..501399e 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -149,11 +149,12 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
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 corrput bitmap
+ */
return bh;
}

@@ -1381,7 +1382,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;
--
1.5.5.23.g2a5fe.dirty

2008-04-10 15:50:27

by Aneesh Kumar K.V

Subject: [PATCH] ext3: Retry block allocation if new blocks are allocated from system zone.

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.

Signed-off-by: Aneesh Kumar K.V <[email protected]>
---
fs/ext3/balloc.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index da0cb2c..874362e 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -164,10 +164,11 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
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 corrput bitmap
+ */
return bh;
}
/*
@@ -1642,7 +1643,12 @@ 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;
--
1.5.5.23.g2a5fe.dirty