Skip to contentSkip to conversation

FAILED: patch "[PATCH] erofs: correct the remaining shrink objects" failed to apply to 4.19-stable tree

PATCH [email protected] 1 participant 1 message Apr 14, 2020

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 9d5a09c6f3b5fb85af20e3a34827b5d27d152b34 Mon Sep 17 00:00:00 2001
From: Gao Xiang <[email protected]>
Date: Wed, 26 Feb 2020 16:10:06 +0800
Subject: [PATCH] erofs: correct the remaining shrink objects

The remaining count should not include successful
shrink attempts.

Fixes e7e9a307be9d ("staging: erofs: introduce workstation for decompression")
Cc <[email protected]> # 4.19+
fs/erofs/utils.c +1 -1
index 4396b424373f..52d0be10f1aa 100644
@@ -262,7 +262,7 @@ static unsigned long erofs_shrink_scan(struct shrinker *shrink,
 		spin_unlock(&erofs_sb_list_lock);
 		sbi->shrinker_run_no = run_no;
 
-		freed += erofs_shrink_workstation(sbi, nr);
+		freed += erofs_shrink_workstation(sbi, nr - freed);
 
 		spin_lock(&erofs_sb_list_lock);
 		/* Get the next list element before we move this one */