f2fs: clear PageError on the read path
When running fault injection test, I hit somewhat wrong behavior in f2fs_gc -> gc_data_segment(): 0. fault injection generated some PageError'ed pages 1. gc_data_segment -> f2fs_get_read_data_page(REQ_RAHEAD) 2. move_data_page -> f2fs_get_lock_data_page() -> f2f_get_read_data_page() -> f2fs_submit_page_read() -> submit_bio(READ) -> return EIO due to PageError -> fail to move data Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
parent
f847c699cf
commit
fb7d70db30
@ -77,7 +77,8 @@ static void __read_end_io(struct bio *bio)
|
|||||||
/* PG_error was set if any post_read step failed */
|
/* PG_error was set if any post_read step failed */
|
||||||
if (bio->bi_status || PageError(page)) {
|
if (bio->bi_status || PageError(page)) {
|
||||||
ClearPageUptodate(page);
|
ClearPageUptodate(page);
|
||||||
SetPageError(page);
|
/* will re-read again later */
|
||||||
|
ClearPageError(page);
|
||||||
} else {
|
} else {
|
||||||
SetPageUptodate(page);
|
SetPageUptodate(page);
|
||||||
}
|
}
|
||||||
@ -591,6 +592,7 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page,
|
|||||||
bio_put(bio);
|
bio_put(bio);
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
}
|
}
|
||||||
|
ClearPageError(page);
|
||||||
__submit_bio(F2FS_I_SB(inode), bio, DATA);
|
__submit_bio(F2FS_I_SB(inode), bio, DATA);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -1579,6 +1581,7 @@ submit_and_realloc:
|
|||||||
if (bio_add_page(bio, page, blocksize, 0) < blocksize)
|
if (bio_add_page(bio, page, blocksize, 0) < blocksize)
|
||||||
goto submit_and_realloc;
|
goto submit_and_realloc;
|
||||||
|
|
||||||
|
ClearPageError(page);
|
||||||
last_block_in_bio = block_nr;
|
last_block_in_bio = block_nr;
|
||||||
goto next_page;
|
goto next_page;
|
||||||
set_error_page:
|
set_error_page:
|
||||||
|
Loading…
Reference in New Issue
Block a user