Viewing: ext4-corrupted-inode-block-bitmaps-handling-patches.patch
commit 2963f3d09eb3a0817f87386c0bd7be7ce086809d
Author: Wang Shilong <wshilong@whamcloud.com>
AuthorDate: Tue Sep 8 21:54:29 2015 +0800
LU-7114 ldiskfs: corrupted bitmaps handling patches
Use ext4_warning() instead of ext4_error() when bitmap corruption
is found on disk, so filesystem don't become read-only by default.
Filesystem will still be usable even if such bad things happen.
Signed-off-by: Wang Shilong <wshilong@ddn.com>
Change-Id: Ib4075aba7df6f7f59e89a90475405080acd43dd0
Reviewed-on: http://review.whamcloud.com/16312
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Yang Sheng <yang.sheng@intel.com>
---
fs/ext4/balloc.c | 18 ++++++-------
fs/ext4/ialloc.c | 6 ++---
fs/ext4/mballoc.c | 64 +++++++++++++++++++----------------------------
3 files changed, 37 insertions(+), 51 deletions(-)
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index 79b20d6a..8809fdb5 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -418,7 +418,7 @@ static int ext4_validate_block_bitmap(struct super_block *sb,
if (unlikely(!ext4_block_bitmap_csum_verify(sb, desc, bh) ||
ext4_simulate_fail(sb, EXT4_SIM_BBITMAP_CRC))) {
ext4_unlock_group(sb, block_group);
- ext4_error(sb, "bg %u: bad block bitmap checksum", block_group);
+ ext4_warning(sb, "bg %u: bad block bitmap checksum", block_group);
ext4_mark_group_bitmap_corrupted(sb, block_group,
EXT4_GROUP_INFO_BBITMAP_CORRUPT);
return -EFSBADCRC;
@@ -426,8 +426,8 @@ static int ext4_validate_block_bitmap(struct super_block *sb,
blk = ext4_valid_block_bitmap(sb, desc, block_group, bh);
if (unlikely(blk != 0)) {
ext4_unlock_group(sb, block_group);
- ext4_error(sb, "bg %u: block %llu: invalid block bitmap",
- block_group, blk);
+ ext4_warning(sb, "bg %u: block %llu: invalid block bitmap",
+ block_group, blk);
ext4_mark_group_bitmap_corrupted(sb, block_group,
EXT4_GROUP_INFO_BBITMAP_CORRUPT);
return -EFSCORRUPTED;
@@ -514,18 +514,16 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group,
goto out;
}
err = ext4_init_block_bitmap(sb, bh, block_group, desc);
- if (err) {
- ext4_unlock_group(sb, block_group);
- unlock_buffer(bh);
- ext4_error(sb, "Failed to init block bitmap for group "
- "%u: %d", block_group, err);
- goto out;
- }
set_bitmap_uptodate(bh);
set_buffer_uptodate(bh);
set_buffer_verified(bh);
ext4_unlock_group(sb, block_group);
unlock_buffer(bh);
+ if (err) {
+ ext4_warning(sb, "Failed to init block bitmap for group "
+ "%u: %d", block_group, err);
+ goto out;
+ }
return bh;
}
ext4_unlock_group(sb, block_group);
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index a9d3d2fc..af739fad 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -102,8 +102,8 @@ static int ext4_validate_inode_bitmap(struct super_block *sb,
EXT4_INODES_PER_GROUP(sb) / 8) ||
ext4_simulate_fail(sb, EXT4_SIM_IBITMAP_CRC)) {
ext4_unlock_group(sb, block_group);
- ext4_error(sb, "Corrupt inode bitmap - block_group = %u, "
- "inode_bitmap = %llu", block_group, blk);
+ ext4_warning(sb, "Corrupt inode bitmap - block_group = %u, "
+ "inode_bitmap = %llu", block_group, blk);
ext4_mark_group_bitmap_corrupted(sb, block_group,
EXT4_GROUP_INFO_IBITMAP_CORRUPT);
return -EFSBADCRC;
@@ -353,7 +353,7 @@ out:
if (!fatal)
fatal = err;
} else {
- ext4_error(sb, "bit already cleared for inode %lu", ino);
+ ext4_warning(sb, "bit already cleared for inode %lu", ino);
ext4_mark_group_bitmap_corrupted(sb, block_group,
EXT4_GROUP_INFO_IBITMAP_CORRUPT);
}
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 4cf0c725..cfe5abc5 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -1092,10 +1092,14 @@ int ext4_mb_generate_buddy(struct super_
grp->bb_fragments = fragments;
if (free != grp->bb_free) {
- ext4_grp_locked_error(sb, group, 0, 0,
- "block bitmap and bg descriptor "
- "inconsistent: %u vs %u free clusters",
- free, grp->bb_free);
+ struct ext4_group_desc *gdp;
+ gdp = ext4_get_group_desc(sb, group, NULL);
+ ext4_warning(sb, "group %lu: block bitmap and bg descriptor "
+ "inconsistent: %u vs %u free clusters "
+ "%u in gd, %lu pa's",
+ (long unsigned int)group, free, grp->bb_free,
+ ext4_free_group_clusters(sb, gdp),
+ grp->bb_prealloc_nr);
/*
* If we intend to continue, we consider group descriptor
* corrupt and update bb_free using bitmap value
@@ -1437,7 +1441,7 @@ ext4_mb_load_buddy_gfp(struct super_bloc
int block;
int pnum;
int poff;
- struct page *page;
+ struct page *page = NULL;
int ret;
struct ext4_group_info *grp;
struct ext4_sb_info *sbi = EXT4_SB(sb);
@@ -1463,7 +1467,7 @@ ext4_mb_load_buddy_gfp(struct super_bloc
*/
ret = ext4_mb_init_group(sb, group, gfp);
if (ret)
- return ret;
+ goto err;
}
/*
@@ -1574,6 +1578,7 @@ err:
e4b->bd_buddy = NULL;
e4b->bd_bitmap = NULL;
+ ext4_warning(sb, "Error loading buddy information for %u", group);
return ret;
}
@@ -4916,9 +4921,11 @@ int ext4_mb_check_ondisk_bitmap(struct s
}
if (free != free_in_gdp) {
- ext4_error(sb, "on-disk bitmap for group %d"
+ ext4_warning(sb, "on-disk bitmap for group %d"
"corrupted: %u blocks free in bitmap, %u - in gd\n",
group, free, free_in_gdp);
+ ext4_mark_group_bitmap_corrupted(sb, group,
+ EXT4_GROUP_INFO_BBITMAP_CORRUPT);
return -EIO;
}
return 0;
@@ -5321,16 +5328,8 @@ ext4_mb_release_inode_pa(struct ext4_bud
/* "free < pa->pa_free" means we maybe double alloc the same blocks,
* otherwise maybe leave some free blocks unavailable, no need to BUG.*/
if ((free > pa->pa_free && !pa->pa_error) || (free < pa->pa_free)) {
- ext4_error(sb, "pa free mismatch: [pa %p] "
- "[phy %lu] [logic %lu] [len %u] [free %u] "
- "[error %u] [inode %d] [freed %u]", pa,
- (unsigned long)pa->pa_pstart,
- (unsigned long)pa->pa_lstart,
- pa->pa_len, (unsigned)pa->pa_free,
- (unsigned)pa->pa_error, pa->pa_inode->i_ino,
- free);
ext4_grp_locked_error(sb, group, 0, 0, "free %u, pa_free %u",
- free, pa->pa_free);
+ free, pa->pa_free);
/*
* pa is already deleted so we use the value obtained
* from the bitmap and continue.
@@ -5391,16 +5390,11 @@ ext4_mb_discard_group_preallocations(str
bitmap_bh = ext4_read_block_bitmap(sb, group);
if (IS_ERR(bitmap_bh)) {
err = PTR_ERR(bitmap_bh);
- ext4_error_err(sb, -err,
- "Error %d reading block bitmap for %u",
- err, group);
goto out_dbg;
}
err = ext4_mb_load_buddy(sb, group, &e4b);
if (err) {
- ext4_warning(sb, "Error %d loading buddy information for %u",
- err, group);
put_bh(bitmap_bh);
goto out_dbg;
}
@@ -5568,17 +5562,12 @@ repeat:
err = ext4_mb_load_buddy_gfp(sb, group, &e4b,
GFP_NOFS|__GFP_NOFAIL);
- if (err) {
- ext4_error_err(sb, -err, "Error %d loading buddy information for %u",
- err, group);
+ if (err)
return;
- }
bitmap_bh = ext4_read_block_bitmap(sb, group);
if (IS_ERR(bitmap_bh)) {
err = PTR_ERR(bitmap_bh);
- ext4_error_err(sb, -err, "Error %d reading block bitmap for %u",
- err, group);
ext4_mb_unload_buddy(&e4b);
continue;
}
@@ -5883,11 +5872,8 @@ ext4_mb_discard_lg_preallocations(struct
group = ext4_get_group_number(sb, pa->pa_pstart);
err = ext4_mb_load_buddy_gfp(sb, group, &e4b,
GFP_NOFS|__GFP_NOFAIL);
- if (err) {
- ext4_error_err(sb, -err, "Error %d loading buddy information for %u",
- err, group);
+ if (err)
continue;
- }
ext4_lock_group(sb, group);
list_del(&pa->pa_group_list);
ext4_get_group_info(sb, group)->bb_prealloc_nr--;
@@ -6254,7 +6240,7 @@ errout:
* been updated or not when fail case. So can
* not revert pa_free back, just mark pa_error*/
pa->pa_error++;
- ext4_error(sb,
+ ext4_warning(sb,
"Updating bitmap error: [err %d] "
"[pa %p] [phy %lu] [logic %lu] "
"[len %u] [free %u] [error %u] "
@@ -6265,6 +6251,7 @@ errout:
(unsigned)pa->pa_free,
(unsigned)pa->pa_error,
pa->pa_inode ? pa->pa_inode->i_ino : 0);
+ ext4_mark_group_bitmap_corrupted(sb, 0, 0);
}
}
ext4_mb_release_context(ac);
@@ -6531,7 +6518,7 @@ do_more:
err = ext4_mb_load_buddy_gfp(sb, block_group, &e4b,
GFP_NOFS|__GFP_NOFAIL);
if (err)
- goto error_return;
+ goto error_brelse;
/*
* We need to make sure we don't reuse the freed block until after the
@@ -6624,8 +6611,9 @@ do_more:
goto do_more;
}
error_return:
- brelse(bitmap_bh);
ext4_std_error(sb, err);
+error_brelse:
+ brelse(bitmap_bh);
return;
}
@@ -6824,7 +6812,7 @@ int ext4_group_add_blocks(handle_t *hand
err = ext4_mb_load_buddy(sb, block_group, &e4b);
if (err)
- goto error_return;
+ goto error_brelse;
/*
* need to update group_info->bb_free and bitmap
@@ -6863,8 +6851,9 @@ int ext4_group_add_blocks(handle_t *hand
err = ret;
error_return:
- brelse(bitmap_bh);
ext4_std_error(sb, err);
+error_brelse:
+ brelse(bitmap_bh);
return err;
}
@@ -6983,8 +6972,6 @@ ext4_trim_all_free(struct super_block *s
ret = ext4_mb_load_buddy(sb, group, &e4b);
if (ret) {
- ext4_warning(sb, "Error %d loading buddy information for %u",
- ret, group);
return ret;
}
