ext3: retry block allocation if new blocks are allocated from system zone

[linux-2.6-omap-h63xx.git] / fs / ext3 / balloc.c

diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index dd4237e5e9ecc6b80a05b7ea5bdda134fc97d346..731fbc0f1291f84bb88ffdcdc5dcfaeab890dbd0 100644 (file)
--- 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 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;