Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[linux-2.6] / fs / ext4 / balloc.c

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index e906b65448e2ed9da721f68056333eacf4386e98..71ee95e534fdcb6c7128aa843accea7b9a082eec 100644 (file)
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -189,15 +189,6 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,
        return desc;
 }
 
-static inline int
-block_in_use(ext4_fsblk_t block, struct super_block *sb, unsigned char *map)
-{
-       ext4_grpblk_t offset;
-
-       ext4_get_group_no_and_offset(sb, block, NULL, &offset);
-       return ext4_test_bit (offset, map);
-}
-
 /**
  * read_block_bitmap()
  * @sb:                        super block
@@ -211,7 +202,6 @@ block_in_use(ext4_fsblk_t block, struct super_block *sb, unsigned char *map)
 struct buffer_head *
 read_block_bitmap(struct super_block *sb, unsigned int block_group)
 {
-       int i;
        struct ext4_group_desc * desc;
        struct buffer_head * bh = NULL;
        ext4_fsblk_t bitmap_blk;
@@ -239,38 +229,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
                            "Cannot read block bitmap - "
                            "block_group = %d, block_bitmap = %llu",
                            block_group, bitmap_blk);
-
-       /* check whether block bitmap block number is set */
-       if (!block_in_use(bitmap_blk, sb, bh->b_data)) {
-               /* bad block bitmap */
-               goto error_out;
-       }
-
-       /* check whether the inode bitmap block number is set */
-       bitmap_blk = ext4_inode_bitmap(sb, desc);
-       if (!block_in_use(bitmap_blk, sb, bh->b_data)) {
-               /* bad block bitmap */
-               goto error_out;
-       }
-       /* check whether the inode table block number is set */
-       bitmap_blk = ext4_inode_table(sb, desc);
-       for (i = 0; i < EXT4_SB(sb)->s_itb_per_group; i++, bitmap_blk++) {
-               if (!block_in_use(bitmap_blk, sb, bh->b_data)) {
-                       /* bad block bitmap */
-                       goto error_out;
-               }
-       }
-
        return bh;
-
-error_out:
-       brelse(bh);
-       ext4_error(sb, __FUNCTION__,
-                       "Invalid block bitmap - "
-                       "block_group = %d, block = %llu",
-                       block_group, bitmap_blk);
-       return NULL;
-
 }
 /*
  * The reservation window structure operations