Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14a28559 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: fix error path of move_data_page 



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>
parent 1174abfd

fs/f2fs/gc.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -780,10 +780,15 @@ 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) {

			clear_cold_data(page);

			if (err == -ENOMEM) {

				congestion_wait(BLK_RW_ASYNC, HZ/50);

				congestion_wait(BLK_RW_ASYNC, HZ/50);

				goto retry;

				goto retry;

			}

			}

			if (is_dirty)

				set_page_dirty(page);

		}

	}

	}

out:

out:

	f2fs_put_page(page, 1);

	f2fs_put_page(page, 1);