erofs: correct the remaining shrink objects
authorGao Xiang <gaoxiang25@huawei.com>
Wed, 26 Feb 2020 08:10:06 +0000 (16:10 +0800)
committerGao Xiang <gaoxiang25@huawei.com>
Tue, 3 Mar 2020 15:39:29 +0000 (23:39 +0800)
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>
fs/erofs/utils.c

index 4396b424373f769a51ffb9f8cf8144e2ae77a245..52d0be10f1aa1ad4645810dfad4aacfbc56c5719 100644 (file)
@@ -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 */