The commit 344150999b7f ("f2fs: fix to avoid potential deadlock") only
requires unplugging current->plug. Using blk_finish_plug() is unnecessary
as it sets current->plug as NULL and prevents wb_writeback() from using
plug in subsequent loops. Instead, use blk_flush_plug() as a replacement.
Signed-off-by: Chunhai Guo <guochun...@vivo.com>
---
fs/f2fs/data.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 5d9697717353..936a95464186 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3343,8 +3343,7 @@ static int __f2fs_write_data_pages(struct address_space
*mapping,
atomic_inc(&sbi->wb_sync_req[DATA]);
else if (atomic_read(&sbi->wb_sync_req[DATA])) {
/* to avoid potential deadlock */
- if (current->plug)
- blk_finish_plug(current->plug);
+ blk_flush_plug(current->plug, false);
goto skip_write;
}
--
2.25.1
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
