[Devel] [PATCH RHEL8 COMMIT] Revert "fs: avoid writeback busy-loop if redirty"

[Konstantin Khorenko]

The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-240.1.1.vz8.5.34
------>
commit 26410212394d26e233d636332f7c22d14218f14a
Author: Vasily Averin <vvs at virtuozzo.com>
Date:   Wed Jun 2 19:48:08 2021 +0300

    Revert "fs: avoid writeback busy-loop if redirty"
    
    This reverts commit vz7 351104c35fa9e976d68c80169bfd62bba26385a6
    (and vz8 57da42f338e8152e8bca281c3bbf12f8107ddce6)
    
    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 at virtuozzo.com>
    
    (cherry picked from commit 4cfdc38c9b5fc193dcd9bdf5076eaf257f905010)
    Fixes: (reverts) vz8: 57da42f338e8 ("fs: avoid writeback busy-loop if redirty")
    
    Signed-off-by: Vasily Averin <vvs at virtuozzo.com>
---
 fs/fs-writeback.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 4bc064e21675..226a030d4a10 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -1674,9 +1674,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;
 }