ext4: block range must be validated before use in ext4_mb_clear_bb()

[linux-2.6-microblaze.git] / fs / ext4 / mballoc.c

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index b02f71f..bd8f8b5 100644 (file)
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -5934,6 +5934,15 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode,
 
        sbi = EXT4_SB(sb);
 
+       if (!(flags & EXT4_FREE_BLOCKS_VALIDATED) &&
+           !ext4_inode_block_valid(inode, block, count)) {
+               ext4_error(sb, "Freeing blocks in system zone - "
+                          "Block = %llu, count = %lu", block, count);
+               /* err = 0. ext4_std_error should be a no op */
+               goto error_return;
+       }
+       flags |= EXT4_FREE_BLOCKS_VALIDATED;
+
 do_more:
        overflow = 0;
        ext4_get_group_no_and_offset(sb, block, &block_group, &bit);
@@ -5950,6 +5959,8 @@ do_more:
                overflow = EXT4_C2B(sbi, bit) + count -
                        EXT4_BLOCKS_PER_GROUP(sb);
                count -= overflow;
+               /* The range changed so it's no longer validated */
+               flags &= ~EXT4_FREE_BLOCKS_VALIDATED;
        }
        count_clusters = EXT4_NUM_B2C(sbi, count);
        bitmap_bh = ext4_read_block_bitmap(sb, block_group);
@@ -5964,7 +5975,8 @@ do_more:
                goto error_return;
        }
 
-       if (!ext4_inode_block_valid(inode, block, count)) {
+       if (!(flags & EXT4_FREE_BLOCKS_VALIDATED) &&
+           !ext4_inode_block_valid(inode, block, count)) {
                ext4_error(sb, "Freeing blocks in system zone - "
                           "Block = %llu, count = %lu", block, count);
                /* err = 0. ext4_std_error should be a no op */
@@ -6087,6 +6099,8 @@ do_more:
                block += count;
                count = overflow;
                put_bh(bitmap_bh);
+               /* The range changed so it's no longer validated */
+               flags &= ~EXT4_FREE_BLOCKS_VALIDATED;
                goto do_more;
        }
 error_return:
@@ -6133,6 +6147,7 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,
                           "block = %llu, count = %lu", block, count);
                return;
        }
+       flags |= EXT4_FREE_BLOCKS_VALIDATED;
 
        ext4_debug("freeing block %llu\n", block);
        trace_ext4_free_blocks(inode, block, count, flags);
@@ -6164,6 +6179,8 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,
                        block -= overflow;
                        count += overflow;
                }
+               /* The range changed so it's no longer validated */
+               flags &= ~EXT4_FREE_BLOCKS_VALIDATED;
        }
        overflow = EXT4_LBLK_COFF(sbi, count);
        if (overflow) {
@@ -6174,6 +6191,8 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,
                                return;
                } else
                        count += sbi->s_cluster_ratio - overflow;
+               /* The range changed so it's no longer validated */
+               flags &= ~EXT4_FREE_BLOCKS_VALIDATED;
        }
 
        if (!bh && (flags & EXT4_FREE_BLOCKS_FORGET)) {