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 e6dab32e37f45972d69a94539d995698b2581c3e..fa8bccca8f8c236d6d0a185f1a5c0712916d08d2 100644 (file)
--- 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;
        }