From patchwork Wed Feb 5 09:27:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960699 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 68D48C02192 for ; Wed, 5 Feb 2025 09:28:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A920D6B0089; Wed, 5 Feb 2025 04:28:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A413B6B008A; Wed, 5 Feb 2025 04:28:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BCDA6B008C; Wed, 5 Feb 2025 04:28:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 67E4D6B0089 for ; Wed, 5 Feb 2025 04:28:03 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 260751A0823 for ; Wed, 5 Feb 2025 09:28:03 +0000 (UTC) X-FDA: 83085364446.14.887C8A9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf23.hostedemail.com (Postfix) with ESMTP id 60653140015 for ; Wed, 5 Feb 2025 09:28:01 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OfDysnf9; spf=pass (imf23.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747681; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=R7Vvp9EGlv2TMusLr7Im3+AMRbyPEdy+5VUuaPm2KpI=; b=bwPekvpDM4d1Ygd+paSny8EKWv4CZFn+PgIar89yY27HYDx7Dy+HAXXq8qCAHUrTyXk5wZ YiBYzkokT5WENcAvxK73TFhnnq0+Vjoa4USHJnwKRue6grmw87cHC+IlUJ6TqzT9Omutvg CYEnGrHzAVosUILuDb5LDvpx/xEbM2M= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747681; a=rsa-sha256; cv=none; b=KTob7mgAgHlJqtUv+EL7P5m0hurn6GMlBM60u4krdlRD1CUn4ufzCR8uM3uaZOLG97o/zs WQI3QNcPAERDLYWaV/CUzROdQxggYPPz29DSWursW8dRBQxziF2P2QsfKmAWWm1uh5fDy7 8AYDJWB863oldzcAAgswVTw8w3/G1xM= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OfDysnf9; spf=pass (imf23.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R7Vvp9EGlv2TMusLr7Im3+AMRbyPEdy+5VUuaPm2KpI=; b=OfDysnf9aKMgygDqUQKnwiFtMSYDjA029mp8M8BjlAEelx3qbSNYV/ya6aeZXoI2laKrLR ZL3P0DfbZxxGjRSM4AR/Nh6TkBjwuMopZtpzS+7Qn7qEVKIbRyfCvhJAb87cZ43aKmQnxS e4l5JlzFvDXp5/Jp5z3UBi1qyXLvOFQ= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-343-SbABTzTlOh2KRzsfQVnkxA-1; Wed, 05 Feb 2025 04:27:55 -0500 X-MC-Unique: SbABTzTlOh2KRzsfQVnkxA-1 X-Mimecast-MFC-AGG-ID: SbABTzTlOh2KRzsfQVnkxA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 153DD1955D86; Wed, 5 Feb 2025 09:27:53 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4E542300018D; Wed, 5 Feb 2025 09:27:48 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 05/12] mm/swap: rename swap_is_has_cache() to swap_only_has_cache() Date: Wed, 5 Feb 2025 17:27:14 +0800 Message-ID: <20250205092721.9395-6-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Stat-Signature: xy8wb1qycays1paj45d5nithogpufu84 X-Rspamd-Queue-Id: 60653140015 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738747681-35610 X-HE-Meta: U2FsdGVkX19+d8ZZp6w6GHGKe0NsoO8E7VLsCguQ2+ORhGW8bVG01gRqzukBindiggAdIY9Z5MyosAYImzibj1P1vF8qdx4F1MToNXYaAbknpVYZNRoK1f9aYr1XTrb5NeJpBsztFRsjQ554vMQniVTuhIaD3k13vV3ArjNp5ITnOkRD6Q8zpLXySRQuNCQZNnjBg8Ubc6iGj6Gu5NIIFkXWxRMc8z/Owi1CdaMjBLouA5BjzuNjDSa3lDj7IIsAwgV3hf4qzzDyEKXkOXaqEJuPWikJCBARSss5c2xuSVIITbBLVrMimKrNFiS3TAA66BqEKbBMeiZti+Eq3iZPanqETwDdORIrNjufiQTrOVc6rYoEFtr8m33F5bWkdw13lTkJVM8rgrtPRz5drCSztdBVOW4S8ahfPeuQ3z6Mi0aQEl9NTxrF6jQ/gVEtgXGcQXvLAYoSFJi8GGYK4GhmLrtT37QjZJLhvfaz1r22biKg+Sg46EvI8z9IHbkqPn5fesQoNFi8aZOZhgJ4AUqekQFQjZrtklElgKDOfJIFF/cnbYNhLPYckAkN+Fmlz2Yb+Hrukp9nD43C4UPSC3t3CTDFfXqrADMbduBEzmAiQncQAvqgbmzGMWU8FfV0W4TDjIB7RefWzhP5BnSXTUESlrtB8PCkXw0wAiJXMr1KAh39BVVN+q5/W31XqLqg7TtWI1l+4Bv2FwVj1LDEjhuw/PR/pKqpFfVcFXnZEz3itr9K57uIivlnT764UI/F3pJSkqnIrcH48yZymB3iAbMJ+oPjkJs2OoOPzm/i3JqrrWH5ceD1/wBFTdzgMcxwkx1NxugiEySfMbRmRYXm8B+pj0AV3zs3c7K8+PG7R2C/jbBHTXyQJVQhDvKm/ixifnPEPlU3c+XBqN2t6W8AUAKbLFgKmCm/odaFGSc5aNpR+hAW6+1Oee4p+O3/0vO1sLb14FD9cpzJU6xEgBPepLR PvBhLupb Frwl879sF+urplkzFdlxx0vXzHn8a0uxNjd6VSQgSoZBGMM+0HFl7bWC63GPNH8RsiitvhBczMZQlwfohzajgJ4YaUXLqvFS7zGBTJySEeB5Qn16gB6dWhz60uNmDtGdv5ovk4EXJbd0vFmCapjwYoeizBVCyamJZ/BBCMtgVAdofIWpg1ZprKRaL6JCm/gjSBb+uBbFFy+CJxlvnV34K65zphAOIYaHiOjV4SJ9Q2olShQ5KXAhkkhiFXJLsXKjQfUSgv5g1JRxfHhYbEnp6H5agKfR0V9cRRBIKNSMvxqoXwzMhYSHEVJNIZDgYufLzk8TaVnFEGFRX8vynqn9PjmdkxlmO05F4LxegyY6ZpA0ipJiMNfa/kTUW/g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: There are two predicates in the name of swap_is_has_cache() which is confusing. Renaming it to remove the confusion and can better reflect its functionality. Signed-off-by: Baoquan He --- mm/swapfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 61efde853eea..bf284ba16198 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -161,7 +161,7 @@ static long swap_usage_in_pages(struct swap_info_struct *si) /* Reclaim directly, bypass the slot cache and don't touch device lock */ #define TTRS_DIRECT 0x8 -static bool swap_is_has_cache(struct swap_info_struct *si, +static bool swap_only_has_cache(struct swap_info_struct *si, unsigned long offset, int nr_pages) { unsigned char *map = si->swap_map + offset; @@ -243,7 +243,7 @@ static int __try_to_reclaim_swap(struct swap_info_struct *si, * reference or pending writeback, and can't be allocated to others. */ ci = lock_cluster(si, offset); - need_reclaim = swap_is_has_cache(si, offset, nr_pages); + need_reclaim = swap_only_has_cache(si, offset, nr_pages); unlock_cluster(ci); if (!need_reclaim) goto out_unlock; @@ -1572,7 +1572,7 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry) return; ci = lock_cluster(si, offset); - if (swap_is_has_cache(si, offset, size)) + if (swap_only_has_cache(si, offset, size)) swap_entry_range_free(si, ci, entry, size); else { for (int i = 0; i < size; i++, entry.val++) {