From: Jaegeuk Kim <jaegeuk@kernel.org>
Date: Tue, 19 May 2020 01:00:33 +0000 (-0700)
Subject: f2fs: avoid inifinite loop to wait for flushing node pages at cp_error
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~1966^2~13
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=6d7c865c2714b122a940774990cfb1d87b57294a;p=linux.git

f2fs: avoid inifinite loop to wait for flushing node pages at cp_error

Shutdown test is somtimes hung, since it keeps trying to flush dirty node pages
in an inifinite loop. Let's drop dirty pages at umount in that case.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index e632de10aeda..e0bb0f7e0506 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1520,8 +1520,15 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted,
 
 	trace_f2fs_writepage(page, NODE);
 
-	if (unlikely(f2fs_cp_error(sbi)))
+	if (unlikely(f2fs_cp_error(sbi))) {
+		if (is_sbi_flag_set(sbi, SBI_IS_CLOSE)) {
+			ClearPageUptodate(page);
+			dec_page_count(sbi, F2FS_DIRTY_NODES);
+			unlock_page(page);
+			return 0;
+		}
 		goto redirty_out;
+	}
 
 	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))
 		goto redirty_out;