From: Ben Hutchings <ben.hutchings@codethink.co.uk>
Date: Mon, 12 Oct 2020 22:18:11 +0000 (+0100)
Subject: Revert "btrfs: flush write bio if we loop in extent_write_cache_pages"
X-Git-Tag: v4.19.156~57
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=aa38097b44153d7470ce8956ec4de8f1372390c6;p=users%2Fdwmw2%2Flinux.git

Revert "btrfs: flush write bio if we loop in extent_write_cache_pages"

This reverts commit 860473714cbe7fbedcf92bfe3eb6d69fae8c74ff.  That
has an incorrect upstream commit reference, and was modified in a way
that conflicts with some older fixes.  We can cleanly cherry-pick the
upstream commit *after* those fixes.

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index e6dab32e37f45..fa8bccca8f8c2 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4045,14 +4045,6 @@ retry:
 		 */
 		scanned = 1;
 		index = 0;
-
-		/*
-		 * If we're looping we could run into a page that is locked by a
-		 * writer and that writer could be waiting on writeback for a
-		 * page in our current bio, and thus deadlock, so flush the
-		 * write bio here.
-		 */
-		flush_write_bio(epd);
 		goto retry;
 	}