* [PATCH 4.19.y] erofs: correct the remaining shrink objects
[not found] <20200414153820.29012-1-hsiangkao.ref@aol.com>
@ 2020-04-14 15:38 ` Gao Xiang via Linux-erofs
2020-04-14 17:40 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Gao Xiang via Linux-erofs @ 2020-04-14 15:38 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, linux-erofs, LKML
From: Gao Xiang <gaoxiang25@huawei.com>
commit 9d5a09c6f3b5fb85af20e3a34827b5d27d152b34 upstream.
The remaining count should not include successful
shrink attempts.
Fixes: e7e9a307be9d ("staging: erofs: introduce workstation for decompression")
Cc: <stable@vger.kernel.org> # 4.19+
Link: https://lore.kernel.org/r/20200226081008.86348-1-gaoxiang25@huawei.com
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
---
trivial adaption, build verified.
drivers/staging/erofs/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/erofs/utils.c b/drivers/staging/erofs/utils.c
index 2d96820da62e..4de9c39535eb 100644
--- a/drivers/staging/erofs/utils.c
+++ b/drivers/staging/erofs/utils.c
@@ -309,7 +309,7 @@ unsigned long erofs_shrink_scan(struct shrinker *shrink,
sbi->shrinker_run_no = run_no;
#ifdef CONFIG_EROFS_FS_ZIP
- freed += erofs_shrink_workstation(sbi, nr, false);
+ freed += erofs_shrink_workstation(sbi, nr - freed, false);
#endif
spin_lock(&erofs_sb_list_lock);
--
2.24.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 4.19.y] erofs: correct the remaining shrink objects
2020-04-14 15:38 ` [PATCH 4.19.y] erofs: correct the remaining shrink objects Gao Xiang via Linux-erofs
@ 2020-04-14 17:40 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2020-04-14 17:40 UTC (permalink / raw)
To: Gao Xiang; +Cc: Gao Xiang, linux-erofs, LKML, stable
On Tue, Apr 14, 2020 at 11:38:20PM +0800, Gao Xiang wrote:
> From: Gao Xiang <gaoxiang25@huawei.com>
>
> commit 9d5a09c6f3b5fb85af20e3a34827b5d27d152b34 upstream.
>
> The remaining count should not include successful
> shrink attempts.
>
> Fixes: e7e9a307be9d ("staging: erofs: introduce workstation for decompression")
> Cc: <stable@vger.kernel.org> # 4.19+
> Link: https://lore.kernel.org/r/20200226081008.86348-1-gaoxiang25@huawei.com
> Reviewed-by: Chao Yu <yuchao0@huawei.com>
> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
> ---
>
> trivial adaption, build verified.
Both backports now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-14 17:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20200414153820.29012-1-hsiangkao.ref@aol.com>
2020-04-14 15:38 ` [PATCH 4.19.y] erofs: correct the remaining shrink objects Gao Xiang via Linux-erofs
2020-04-14 17:40 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).