From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 928C5C2BB55 for ; Thu, 16 Apr 2020 13:35:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5F407221F4 for ; Thu, 16 Apr 2020 13:35:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587044159; bh=+IihUw+6SGwkdQnmsD8FiVqQUmXU2ZZTpB7TR3Hzxjw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CEkfSgRGN44fEOZ7wclcIeQA/wd3FzgrY8U9r9jradQ+7J5n5ZpFdw5DL5nz3SEvY 075q3gnxiw857RKnfT856mEf7YZuNh9VyLYK3BQeUVOu6iTXXuiuJhjSwECdACa30z 7H+PF78Edo2PNFMvjIIQMXxOS80jN+ClAuQnHBic= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2897249AbgDPNf4 (ORCPT ); Thu, 16 Apr 2020 09:35:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:39496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2896029AbgDPN3g (ORCPT ); Thu, 16 Apr 2020 09:29:36 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8F822208E4; Thu, 16 Apr 2020 13:29:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587043776; bh=+IihUw+6SGwkdQnmsD8FiVqQUmXU2ZZTpB7TR3Hzxjw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UzUcVDDCMeY/HxBT76hGT6NLpR/1AcaMqCrJ5KQraAUCe7rNF7pXdk5LijFdmvzII +q+EWpqygeKD8FPmu81B7QQU16+wb/F1pOQ9FbmdpMhIVmm43gO+rPvl4bb7EMrRtJ XGuvRz/6OwNJOowrrI0TGig7eeupnUjGwL6BMU6k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Gao Xiang Subject: [PATCH 4.19 095/146] erofs: correct the remaining shrink objects Date: Thu, 16 Apr 2020 15:23:56 +0200 Message-Id: <20200416131255.773411526@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131242.353444678@linuxfoundation.org> References: <20200416131242.353444678@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gao Xiang commit 9d5a09c6f3b5fb85af20e3a34827b5d27d152b34 upstream. The remaining count should not include successful shrink attempts. Fixes: e7e9a307be9d ("staging: erofs: introduce workstation for decompression") Cc: # 4.19+ Link: https://lore.kernel.org/r/20200226081008.86348-1-gaoxiang25@huawei.com Reviewed-by: Chao Yu Signed-off-by: Gao Xiang Signed-off-by: Greg Kroah-Hartman --- drivers/staging/erofs/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/staging/erofs/utils.c +++ b/drivers/staging/erofs/utils.c @@ -309,7 +309,7 @@ unsigned long erofs_shrink_scan(struct s 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);