lkml.org 
[lkml]   [2020]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4.19 15/71] Revert "btrfs: flush write bio if we loop in extent_write_cache_pages"
Date
From: Ben Hutchings <ben.hutchings@codethink.co.uk>

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>
---
fs/btrfs/extent_io.c | 8 --------
1 file changed, 8 deletions(-)

--- 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;
}


\
 
 \ /
  Last update: 2020-11-09 14:32    [W:0.830 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site