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,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 02963C2BA19 for ; Tue, 14 Apr 2020 11:42:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF4342076B for ; Tue, 14 Apr 2020 11:42:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586864559; bh=k7kWemlBua0TTkDi5HsDR94eVSk6Vg2d+Mbj1k4dpCg=; h=Subject:To:Cc:From:Date:List-ID:From; b=XPztUNAf9MZP+5Ee4z846gl1FXqkT2FuDNvs7jyJlCqhgc/fGeV7Exq8qeQ1B/I5I 8Mx4fudBX8sPO6Z5mokf1rxCHDc0lI59xPxIonQkfoXxU7ZNmF5TQhMlmwbUSfHDUZ HWMUuP1aLU+mDI1KNewmbAh0CkfrXvqA+y2UVWNo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439490AbgDNLmi (ORCPT ); Tue, 14 Apr 2020 07:42:38 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:37603 "EHLO wout4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439481AbgDNLmf (ORCPT ); Tue, 14 Apr 2020 07:42:35 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id B5CA59B4; Tue, 14 Apr 2020 07:42:34 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Tue, 14 Apr 2020 07:42:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=wG13IX B5Qp6VOasvsR6q3x2BjfUnCQB2DJ6RpuSm7w4=; b=IsnBQL3Mp9FdPF4F5kcjsC t7Qo0WyHwWiNChyG6nVq1re6tKD/MAlJO6jEA34cPXYfckKQms5A/r3xgXhzNRUe utBMU684r4rDjtRI4DT6Wmlrj/RlNZH6BFbIJVTRYq45FDZCCK1XhdtDYY4Uoldu d56oCMCdVbyPWd7ZjNlBDyg5W5WazLfyuKYmGX6m9eedul8fX6ic4ynLbfwzCEr2 2a6VbCLI0cNDSJM8vTgdphwaNRVAsLWgrKWtphVmM6lXzRudeVMtOHMtZavIBn19 ImAzZ4S63tKkI1/HRxyRTCCdbJxDlrc1LXGeRDfYEvshW9P3n1L7N4LNzB4Z1IZA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrfedugdegfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttd flnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhg qeenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecukfhppeekfedrkeeirdekledrud dtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehg rhgvgheskhhrohgrhhdrtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id F2304306005B; Tue, 14 Apr 2020 07:42:33 -0400 (EDT) Subject: FAILED: patch "[PATCH] erofs: correct the remaining shrink objects" failed to apply to 5.4-stable tree To: xiang@kernel.org, gaoxiang25@huawei.com, stable@vger.kernel.org, yuchao0@huawei.com Cc: From: Date: Tue, 14 Apr 2020 13:42:25 +0200 Message-ID: <1586864545119140@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.4-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 . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 9d5a09c6f3b5fb85af20e3a34827b5d27d152b34 Mon Sep 17 00:00:00 2001 From: Gao Xiang 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: # 4.19+ Link: https://lore.kernel.org/r/20200226081008.86348-1-gaoxiang25@huawei.com Reviewed-by: Chao Yu Signed-off-by: Gao Xiang diff --git a/fs/erofs/utils.c b/fs/erofs/utils.c index 4396b424373f..52d0be10f1aa 100644 --- a/fs/erofs/utils.c +++ b/fs/erofs/utils.c @@ -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 */