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.

[akpm@linux-foundation.org: fix typo in comment]
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 25dec86..10bb02c 100644 (file)
--- 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 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;