f2fs: fix error path of move_data_page
authorChao Yu <yuchao0@huawei.com>
Mon, 28 May 2018 08:59:27 +0000 (16:59 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Thu, 31 May 2018 18:31:52 +0000 (11:31 -0700)
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>
fs/f2fs/gc.c

index 50bb8fc25275044997a88fbe02f218b6e8327ede..885032fc3a6197b833e4b22311dc7df74dcffddd 100644 (file)
@@ -780,9 +780,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);
                }
        }
 out: