ext4: make the bitmap read routines return real error codes

Make the bitmap reaading routines return real error codes (EIO,
EFSCORRUPTED, EFSBADCRC) which can then be reflected back to
userspace for more precise diagnosis work.

In particular, this means that mballoc no longer claims that we're out
of memory if the block bitmaps become corrupt.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

1 files changed, 30 insertions, 16 deletions

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index b0f7ee57630b..6794ff47cfaf 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -874,8 +874,10 @@ static int ext4_mb_init_cache(struct page *page, char *incore)
                         bh[i] = NULL;
                         continue;
                 }
-                if (!(bh[i] = ext4_read_block_bitmap_nowait(sb, group))) {
-                        err = -ENOMEM;
+                bh[i] = ext4_read_block_bitmap_nowait(sb, group);
+                if (IS_ERR(bh[i])) {
+                        err = PTR_ERR(bh[i]);
+                        bh[i] = NULL;
                         goto out;
                 }
                 mb_debug(1, "read bitmap for group %u\n", group);
@@ -883,8 +885,13 @@ static int ext4_mb_init_cache(struct page *page, char *incore)
 
         /* wait for I/O completion */
         for (i = 0, group = first_group; i < groups_per_page; i++, group++) {
-                if (bh[i] && ext4_wait_block_bitmap(sb, group, bh[i]))
-                        err = -EIO;
+                int err2;
+
+                if (!bh[i])
+                        continue;
+                err2 = ext4_wait_block_bitmap(sb, group, bh[i]);
+                if (!err)
+                        err = err2;
         }
 
         first_block = page->index * blocks_per_page;
@@ -2447,7 +2454,7 @@ int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group,
                         kmalloc(sb->s_blocksize, GFP_NOFS);
                 BUG_ON(meta_group_info[i]->bb_bitmap == NULL);
                 bh = ext4_read_block_bitmap(sb, group);
-                BUG_ON(bh == NULL);
+                BUG_ON(IS_ERR_OR_NULL(bh));
                 memcpy(meta_group_info[i]->bb_bitmap, bh->b_data,
                         sb->s_blocksize);
                 put_bh(bh);
@@ -2889,10 +2896,12 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac,
         sb = ac->ac_sb;
         sbi = EXT4_SB(sb);
 
-        err = -EIO;
         bitmap_bh = ext4_read_block_bitmap(sb, ac->ac_b_ex.fe_group);
-        if (!bitmap_bh)
+        if (IS_ERR(bitmap_bh)) {
+                err = PTR_ERR(bitmap_bh);
+                bitmap_bh = NULL;
                 goto out_err;
+        }
 
         BUFFER_TRACE(bitmap_bh, "getting write access");
         err = ext4_journal_get_write_access(handle, bitmap_bh);
@@ -3836,8 +3845,10 @@ ext4_mb_discard_group_preallocations(struct super_block *sb,
                 return 0;
 
         bitmap_bh = ext4_read_block_bitmap(sb, group);
-        if (bitmap_bh == NULL) {
-                ext4_error(sb, "Error reading block bitmap for %u", group);
+        if (IS_ERR(bitmap_bh)) {
+                err = PTR_ERR(bitmap_bh);
+                ext4_error(sb, "Error %d reading block bitmap for %u",
+                           err, group);
                 return 0;
         }
 
@@ -4008,9 +4019,10 @@ repeat:
                 }
 
                 bitmap_bh = ext4_read_block_bitmap(sb, group);
-                if (bitmap_bh == NULL) {
-                        ext4_error(sb, "Error reading block bitmap for %u",
-                                        group);
+                if (IS_ERR(bitmap_bh)) {
+                        err = PTR_ERR(bitmap_bh);
+                        ext4_error(sb, "Error %d reading block bitmap for %u",
+                                        err, group);
                         ext4_mb_unload_buddy(&e4b);
                         continue;
                 }
@@ -4754,8 +4766,9 @@ do_more:
         }
         count_clusters = EXT4_NUM_B2C(sbi, count);
         bitmap_bh = ext4_read_block_bitmap(sb, block_group);
-        if (!bitmap_bh) {
-                err = -EIO;
+        if (IS_ERR(bitmap_bh)) {
+                err = PTR_ERR(bitmap_bh);
+                bitmap_bh = NULL;
                 goto error_return;
         }
         gdp = ext4_get_group_desc(sb, block_group, &gd_bh);
@@ -4924,8 +4937,9 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,
         }
 
         bitmap_bh = ext4_read_block_bitmap(sb, block_group);
-        if (!bitmap_bh) {
-                err = -EIO;
+        if (IS_ERR(bitmap_bh)) {
+                err = PTR_ERR(bitmap_bh);
+                bitmap_bh = NULL;
                 goto error_return;
         }