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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B0DAC0219B for ; Fri, 7 Feb 2025 09:48:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 389D3280009; Fri, 7 Feb 2025 04:48:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 33900280007; Fri, 7 Feb 2025 04:48:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2288A280009; Fri, 7 Feb 2025 04:48:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 034AD280007 for ; Fri, 7 Feb 2025 04:48:31 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D1B8E1419DE for ; Fri, 7 Feb 2025 09:44:36 +0000 (UTC) X-FDA: 83092663794.13.514090B Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by imf07.hostedemail.com (Postfix) with ESMTP id 9A28240006 for ; Fri, 7 Feb 2025 09:44:34 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=bGM4ZQm2; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.113 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738921475; a=rsa-sha256; cv=none; b=FiykyslehMvKudasK/1uLCLv9eGIdSlWtZrxpcP6zal2YqHJ+NlnIE3R3tGBO4dLmMt0G1 BxmoJ9+kMb0CVVTqa/1FUB3H4/tbhbHODPoVzKLREHqKkTkyd2oUd7f5Z5Xpu4YEmt+nYY IYGdDZKhJWWzgyaApzQZxoYNygopfGA= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=bGM4ZQm2; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.113 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738921475; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kcZEGoLAZWYmpxFrSA4KxILcMvDpALoGBVXuA8rwiuA=; b=t6uRlmbHyGpJ5+D//+WtR/HcjhjyZ3Jr7IAbdHH9Ki+b/+vCRC6NqgMCs2IC2oE4CWidtF 8DGh8eAHI1UsD6J12orzZwUbx9WPYAl3dvBL58jsr+96dQMiy2xxCg7rRu1xYSG3wbcxoN dsylTGS8HmPVw8lEXCvErdaJEO1Q9M8= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1738921471; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=kcZEGoLAZWYmpxFrSA4KxILcMvDpALoGBVXuA8rwiuA=; b=bGM4ZQm2T+6qFM4Vh9dklNqjJSxaxY3ErMKtdiuA1RrVrwrHRCAbH3WWsEj9KPRxYhtgtvo5aHRF1CxOTIcKmbOBqP5+32o2Ldbxlr8c/Uyfg/Rg7hOLR7xGdUGQVGbp872N2aBMo+OF37uxq+QoxAoz/wySKKrvoMVDh92b0YM= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WOz4okK_1738921470 cluster:ay36) by smtp.aliyun-inc.com; Fri, 07 Feb 2025 17:44:30 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: david@redhat.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] mm: shmem: change the return value of shmem_find_swap_entries() Date: Fri, 7 Feb 2025 17:44:20 +0800 Message-Id: <070489b5946b8379b2a2d25f78115cef167cd145.1738918357.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 9A28240006 X-Stat-Signature: msf7wadtt6jwr9zx4aje83xteu35zto4 X-Rspam-User: X-HE-Tag: 1738921474-284951 X-HE-Meta: U2FsdGVkX19uJ7a+7vCVNJufSHuTDqzMYu4y+aVvdN/aKxklKsNYJO6flegASy8Wrg69IIPEsQxdMbICMxZzAtTK9yjBEjGUCT0o8y1sK/Athm2Cg9le+ESrsKp9tp/z0WiLM/yHxzWGHlDvNataONFv1qFSbC0UVAfKveOuxTEz6Pz3AKsZrp1vLlSAl0AD2XmF/4y2h+ASgL8MvlcQ2WfWAykXZXH0Qt7S3PDlzYhb/lfY0lhtowcGDz0wKb8swCwCieH8moh7B9JGAEBLdKBEylVOrPJ3UC7NBkuDrnbu2TQqYdDWgs6FcsaDD2IyL/rMNxDJGSjQF6faTOBOyPocm3W8/ZZusg+UDfGIQMF7rhDNI8NteyXnvD627D1KLSJrWwHmhudZhTx2qFlwmOfYBNeNSVvJGAoWn49QrVcGGKW7Kev/IVp67nfMnPJEzs4yOaYngFNADsnPLkOkGRHSZthNgy6dNbFFpwugGBnWUm1h0nvHSYGSdOtAbcpDY6WIutj3J8mU1eaIPFttwIKx1+MK3WYUY+G42tjL8X2I53U1/Zb4uRGW3TzV8GTwBg+lLQzhl/hbqsDPAgXHqTuRa33HftBvxrpGCaIcp3AfP3ryAu6nc9J3auogm2kIBtP37Dv9dIwaqLnlQ84pFXTvRD7U4/ZcUnS55hMUjy/geB4er3XyGVZg29rjpoxEp76jzKnpxLMcet5vZc9ypugWhNSG4KLxVGRD00vX/6I0d0dfKWNaDhT6gDpEiIP8lS8MXj0IwOM+vpLvYRkJM0HjWnlx0xUhhxfb1V8JQsJ0EnBwqL1lPbbQ/NK90erjwDWm++uSOd0pEJSHU6BNtEt60mqTdR5tHCGxAoBcHpVHHtvvBvwij4ib3g0vBygOvlpR//cEbfjHCv0ca6IJvDR3QuU60PNKQn2IJYOPwsmxNTNhW/B2ToE5S1lobn8hFNS3cSBwCEwV1xViUDD txmtWHgw v40VJojBOqYUafRxc5uNUQCZWnUsH/NsBQCj0sasQGQZ02jZ/fCKD8IYNE5/93bYcV7l60GwOWjqyspyHj7QGp9cjyxnWsZdOnPi4VRK6iBHjt2oxeX+UXNugYd/jWlg8fiyLNHS46v7F+UQUNbbr2VOUQLI7c6CAPhv60IyTk670p2sDx/oVp+gCx78ihTTKrO7Pjww31Ad6FDKjPl3MyMlSdKjSJWW760A6es+zepDi4zSnD3KeU9Q18+xa1HyRc3naUNDeJbcNKdw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.028872, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The shmem_find_swap_entries() originally returned the index corresponding to the swap entry, but no callers used this return value. It should return the number of entries that were found like other functions, which can be used by the callers. No functional changes. Signed-off-by: Baolin Wang --- mm/shmem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index b764ad336598..c243d814f2b0 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1379,9 +1379,9 @@ static void shmem_evict_inode(struct inode *inode) #endif } -static int shmem_find_swap_entries(struct address_space *mapping, - pgoff_t start, struct folio_batch *fbatch, - pgoff_t *indices, unsigned int type) +static unsigned int shmem_find_swap_entries(struct address_space *mapping, + pgoff_t start, struct folio_batch *fbatch, + pgoff_t *indices, unsigned int type) { XA_STATE(xas, &mapping->i_pages, start); struct folio *folio; @@ -1414,7 +1414,7 @@ static int shmem_find_swap_entries(struct address_space *mapping, } rcu_read_unlock(); - return xas.xa_index; + return folio_batch_count(fbatch); } /* @@ -1461,8 +1461,8 @@ static int shmem_unuse_inode(struct inode *inode, unsigned int type) do { folio_batch_init(&fbatch); - shmem_find_swap_entries(mapping, start, &fbatch, indices, type); - if (folio_batch_count(&fbatch) == 0) { + if (!shmem_find_swap_entries(mapping, start, &fbatch, + indices, type)) { ret = 0; break; } -- 2.39.3