Skip to content

Commit bd90c5c

Browse files
author
Jaegeuk Kim
committed
f2fs: relax sanity check if checkpoint is corrupted
1. extent_cache - let's drop the largest extent_cache 2. invalidate_block - don't show the warnings Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 2d3f197 commit bd90c5c

3 files changed

Lines changed: 29 additions & 7 deletions

File tree

fs/f2fs/checkpoint.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,11 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr,
152152
se = get_seg_entry(sbi, segno);
153153

154154
exist = f2fs_test_bit(offset, se->cur_valid_map);
155+
156+
/* skip data, if we already have an error in checkpoint. */
157+
if (unlikely(f2fs_cp_error(sbi)))
158+
return exist;
159+
155160
if (exist && type == DATA_GENERIC_ENHANCE_UPDATE) {
156161
f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",
157162
blkaddr, exist);
@@ -202,6 +207,11 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,
202207
case DATA_GENERIC_ENHANCE_UPDATE:
203208
if (unlikely(blkaddr >= MAX_BLKADDR(sbi) ||
204209
blkaddr < MAIN_BLKADDR(sbi))) {
210+
211+
/* Skip to emit an error message. */
212+
if (unlikely(f2fs_cp_error(sbi)))
213+
return false;
214+
205215
f2fs_warn(sbi, "access invalid blkaddr:%u",
206216
blkaddr);
207217
set_sbi_flag(sbi, SBI_NEED_FSCK);

fs/f2fs/data.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2237,6 +2237,10 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,
22372237
if (ret)
22382238
goto out;
22392239

2240+
if (unlikely(f2fs_cp_error(sbi))) {
2241+
ret = -EIO;
2242+
goto out_put_dnode;
2243+
}
22402244
f2fs_bug_on(sbi, dn.data_blkaddr != COMPRESS_ADDR);
22412245

22422246
skip_reading_dnode:

fs/f2fs/extent_cache.c

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,26 @@ bool sanity_check_extent_cache(struct inode *inode)
2323
{
2424
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
2525
struct f2fs_inode_info *fi = F2FS_I(inode);
26+
struct extent_tree *et = fi->extent_tree[EX_READ];
2627
struct extent_info *ei;
2728

28-
if (!fi->extent_tree[EX_READ])
29+
if (!et)
30+
return true;
31+
32+
ei = &et->largest;
33+
if (!ei->len)
2934
return true;
3035

31-
ei = &fi->extent_tree[EX_READ]->largest;
36+
/* Let's drop, if checkpoint got corrupted. */
37+
if (is_set_ckpt_flags(sbi, CP_ERROR_FLAG)) {
38+
ei->len = 0;
39+
et->largest_updated = true;
40+
return true;
41+
}
3242

33-
if (ei->len &&
34-
(!f2fs_is_valid_blkaddr(sbi, ei->blk,
35-
DATA_GENERIC_ENHANCE) ||
36-
!f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
37-
DATA_GENERIC_ENHANCE))) {
43+
if (!f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE) ||
44+
!f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
45+
DATA_GENERIC_ENHANCE)) {
3846
set_sbi_flag(sbi, SBI_NEED_FSCK);
3947
f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix",
4048
__func__, inode->i_ino,

0 commit comments

Comments
 (0)