f2fs: fix error path of move_data_page

[ Upstream commit 14a28559f43ac7c0b98dd1b0e73ec9ec8ab4fc45 ]

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: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 17ab23f..ad4dfd2 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -688,9 +688,14 @@ retry:
                set_cold_data(page);
 
                err = do_write_data_page(&fio);
-               if (err == -ENOMEM && is_dirty) {
-                       congestion_wait(BLK_RW_ASYNC, HZ/50);
-                       goto retry;
+               if (err) {
+                       clear_cold_data(page);
+                       if (err == -ENOMEM) {
+                               congestion_wait(BLK_RW_ASYNC, HZ/50);
+                               goto retry;
+                       }
+                       if (is_dirty)
+                               set_page_dirty(page);
                }
 
                clear_cold_data(page);