Commit 4e6b7aad authored by Chao Yu's avatar Chao Yu Committed by Greg Kroah-Hartman

f2fs: fix error path of move_data_page

[ Upstream commit 14a28559 ]

This patch fixes error path of move_data_page:
- clear cold data flag if it fails to write page.
- redirty page for non-ENOMEM case.
Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c9ab0cef
...@@ -688,9 +688,14 @@ static void move_data_page(struct inode *inode, block_t bidx, int gc_type) ...@@ -688,9 +688,14 @@ static void move_data_page(struct inode *inode, block_t bidx, int gc_type)
set_cold_data(page); set_cold_data(page);
err = do_write_data_page(&fio); err = do_write_data_page(&fio);
if (err == -ENOMEM && is_dirty) { if (err) {
congestion_wait(BLK_RW_ASYNC, HZ/50); clear_cold_data(page);
goto retry; if (err == -ENOMEM) {
congestion_wait(BLK_RW_ASYNC, HZ/50);
goto retry;
}
if (is_dirty)
set_page_dirty(page);
} }
clear_cold_data(page); clear_cold_data(page);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment