[RHEL7,COMMIT] Revert "fs: avoid writeback busy-loop if redirty"

Submitted by Konstantin Khorenko on Oct. 25, 2019, 10 p.m.

Details

Message ID 201910252200.x9PM07Px006741@finist-ce7.sw.ru
State New
Series "Revert "fs: avoid writeback busy-loop if redirty""
Headers show

Commit Message

Konstantin Khorenko Oct. 25, 2019, 10 p.m.
The commit is pushed to "branch-rh7-3.10.0-1062.1.2.vz7.114.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1062.1.2.vz7.114.10
------>
commit 849fc13df16c30b280b65498ba35712675070980
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Sat Oct 26 00:56:58 2019 +0300

    Revert "fs: avoid writeback busy-loop if redirty"
    
    This reverts commit 351104c35fa9e976d68c80169bfd62bba26385a6.
    
    The patch made sense previously because fuse_writepages() called
    redirty_page_for_writepage(), but nowadays it does not, so
    let's remove the hack.
    
    Found while working in the scope of
    https://jira.sw.ru/browse/PSBM-97743
    
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 fs/fs-writeback.c | 3 ---
 1 file changed, 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 76c1aa26fd6f..bf57e612114e 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -831,9 +831,6 @@  static long writeback_sb_inodes(struct super_block *sb,
 			if (work->nr_pages <= 0)
 				break;
 		}
-
-		WARN_ON(wbc.pages_skipped > write_chunk - wbc.nr_to_write);
-		wrote -= wbc.pages_skipped;
 	}
 	return wrote;
 }