From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9827E244694 for ; Tue, 23 Jun 2026 12:57:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782219470; cv=none; b=Dgd7SbvyNMFoDuMTz3LWdKM/FIS/aJNWv4USUafl4FBsweiQRg7pRFK5mz9k/76MY1uELVguhQyKZuKFay1tcJsnQTDYfF5Kuek1MWqWpM6u67IIKNAH7PN2WnntY2j7c4ye+7bpIS2aanDD9tmHfr9wJ6/nd5jTfYK1hTk5tX8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782219470; c=relaxed/simple; bh=DkUvI4H/W+JmbCbw7Jp0p0O7QapXeIB3dwVTXIwbuLw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jZwSvJ7MwqTQU/yQA+ZeFqCB766XyTLLk/JdtJALI1jt6IlCJqVT4ssocpxqh5t0Yh2ApxtALXjC/oIN07MgQZ9jxDp9V/fa/9Emnq6/5XMNzdIc96qPEd0x06hPpU1QIpG52nDoxr1RbVK7Sk7J56xd2nbZQ7XOeJ3mVrsNox0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=W5LQ0LvX; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="W5LQ0LvX" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5F2B1244C; Tue, 23 Jun 2026 05:57:38 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-01.blr.arm.com (cesw-amp-gbt-1s-m12830-01.blr.arm.com [10.164.195.31]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E7FD93F632; Tue, 23 Jun 2026 05:57:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1782219463; bh=DkUvI4H/W+JmbCbw7Jp0p0O7QapXeIB3dwVTXIwbuLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W5LQ0LvXDgaSTzdSuAeZxPMFaiCyk7BbihuLunKq4VnAuDf9877AnV5+QaYDpbJdy CsF6YmoYxur2iiur7K3p9sw9iC7v8xFQKuynef0CAjxTJDsWBvyfXVG48Ffe1cnAAP je9qRVX2RHWo5NMIRonb0FHnANmFJMd1ertIrS2w= From: Dev Jain To: akpm@linux-foundation.org, chrisl@kernel.org, kasong@tencent.com, liam@infradead.org, ljs@kernel.org Cc: Dev Jain , shikemeng@huaweicloud.com, nphamcs@gmail.com, baoquan.he@linux.dev, baohua@kernel.org, youngjun.park@lge.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, vbabka@kernel.org, jannh@google.com, pfalcato@suse.de, ryan.roberts@arm.com, anshuman.khandual@arm.com, david@kernel.org Subject: [PATCH 1/2] mm/swap: rename subpage->page in folio_dup_swap/folio_put_swap Date: Tue, 23 Jun 2026 12:57:21 +0000 Message-ID: <20260623125723.2503832-2-dev.jain@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260623125723.2503832-1-dev.jain@arm.com> References: <20260623125723.2503832-1-dev.jain@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Folios have pages, not subpages. Rename 'subpage' parameters to 'page'. Acked-by: David Hildenbrand (Arm) Signed-off-by: Dev Jain --- mm/swap.h | 4 ++-- mm/swapfile.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mm/swap.h b/mm/swap.h index 77d2d14eda421..44ab8e1e595b0 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -230,8 +230,8 @@ extern int swap_retry_table_alloc(swp_entry_t entry, gfp_t gfp); * folio_put_swap(): does the opposite thing of folio_dup_swap(). */ int folio_alloc_swap(struct folio *folio); -int folio_dup_swap(struct folio *folio, struct page *subpage); -void folio_put_swap(struct folio *folio, struct page *subpage); +int folio_dup_swap(struct folio *folio, struct page *page); +void folio_put_swap(struct folio *folio, struct page *page); /* For internal use */ extern void __swap_cluster_free_entries(struct swap_info_struct *si, diff --git a/mm/swapfile.c b/mm/swapfile.c index 78b49b0658add..a602e5820513a 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1781,7 +1781,7 @@ int folio_alloc_swap(struct folio *folio) /** * folio_dup_swap() - Increase swap count of swap entries of a folio. * @folio: folio with swap entries bounded. - * @subpage: if not NULL, only increase the swap count of this subpage. + * @page: if not NULL, only increase the swap count of this page. * * Typically called when the folio is unmapped and have its swap entry to * take its place: Swap entries allocated to a folio has count == 0 and pinned @@ -1795,7 +1795,7 @@ int folio_alloc_swap(struct folio *folio) * swap_put_entries_direct on its swap entry before this helper returns, or * the swap count may underflow. */ -int folio_dup_swap(struct folio *folio, struct page *subpage) +int folio_dup_swap(struct folio *folio, struct page *page) { swp_entry_t entry = folio->swap; unsigned long nr_pages = folio_nr_pages(folio); @@ -1803,8 +1803,8 @@ int folio_dup_swap(struct folio *folio, struct page *subpage) VM_WARN_ON_FOLIO(!folio_test_locked(folio), folio); VM_WARN_ON_FOLIO(!folio_test_swapcache(folio), folio); - if (subpage) { - entry.val += folio_page_idx(folio, subpage); + if (page) { + entry.val += folio_page_idx(folio, page); nr_pages = 1; } @@ -1815,13 +1815,13 @@ int folio_dup_swap(struct folio *folio, struct page *subpage) /** * folio_put_swap() - Decrease swap count of swap entries of a folio. * @folio: folio with swap entries bounded, must be in swap cache and locked. - * @subpage: if not NULL, only decrease the swap count of this subpage. + * @page: if not NULL, only decrease the swap count of this page. * * This won't free the swap slots even if swap count drops to zero, they are * still pinned by the swap cache. User may call folio_free_swap to free them. * Context: Caller must ensure the folio is locked and in the swap cache. */ -void folio_put_swap(struct folio *folio, struct page *subpage) +void folio_put_swap(struct folio *folio, struct page *page) { swp_entry_t entry = folio->swap; unsigned long nr_pages = folio_nr_pages(folio); @@ -1830,8 +1830,8 @@ void folio_put_swap(struct folio *folio, struct page *subpage) VM_WARN_ON_FOLIO(!folio_test_locked(folio), folio); VM_WARN_ON_FOLIO(!folio_test_swapcache(folio), folio); - if (subpage) { - entry.val += folio_page_idx(folio, subpage); + if (page) { + entry.val += folio_page_idx(folio, page); nr_pages = 1; } -- 2.43.0