From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1C7F3FBA7 for ; Tue, 23 Jun 2026 16:45:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782233158; cv=none; b=r9I7rYy4kTjWmSl0/zoSU9k+LHU4EaXDNy8WLGvT5C3B5VpWU1CInowgGWSkp8LY/B/vomLTgyKbyMvgOa0NgPAH8uAu0fh2QeLNJrlUZKJnHUGugNeIMKzqAabE46+2gLVuy0Q001BOSy8vJE11dND6yiE9rnKyV6dpZ29Gayo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782233158; c=relaxed/simple; bh=7vUAL3tlSYYouZOaHvxBZZd83YBhl2697ljk2AyuDCI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=JZHvtWQzHeP2h4xOJh7OoFuy0XJy6cD//rIV82WFSjl0QRbeNfattzSOWpVqeyeZ24FcyetZw36Gl9Dg4Jw9Zp0RckPzEvB1ls/XFP7XtlX2ah9cmpk9MVkw9aN7vOMl5ula/b6m3z+cZoLh+zQwR/GWFrb00d/cAE6yNp2z/JY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WNoNdlTf; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WNoNdlTf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC9781F000E9; Tue, 23 Jun 2026 16:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782233157; bh=zvnJVHOKhUJTuaDT+cJ6ybd01RvOsf9xGCdjcPmiwiw=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=WNoNdlTf5dtoVDrLtPpaABEWdsNJzXTRo4n42kxANANgtU3aTQQgD59XzJIMaD6NE FMReDXe3YQIdJpTDoIcIapQA6oASlDdnjZ7FaF4nJrISrV8jtwbdoCQWekxPrUbL6B UuqcdbC9i4S+nCAsvKfBuu/IlzE1cnTDEkAKPTctj8notPVtMIIdA9S6k1Ir5JrZEw QVDQ4w3vrwaPbW+6DSbWDqwKQfxS1uL0ua8u0cMQ8ikARTdccgvTkZBwi/p8j+3FuK 4LuVes7IHfWWphMl0/EQPlXiTQt3C4n/TSzvtT47KHvQcFW+tCkGmMsP+xmsXmXhjF JjyhRhzIiDfqw== Date: Tue, 23 Jun 2026 17:45:49 +0100 From: Lorenzo Stoakes To: Dev Jain Cc: akpm@linux-foundation.org, chrisl@kernel.org, kasong@tencent.com, liam@infradead.org, 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: Re: [PATCH 1/2] mm/swap: rename subpage->page in folio_dup_swap/folio_put_swap Message-ID: References: <20260623125723.2503832-1-dev.jain@arm.com> <20260623125723.2503832-2-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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260623125723.2503832-2-dev.jain@arm.com> On Tue, Jun 23, 2026 at 12:57:21PM +0000, Dev Jain wrote: > Folios have pages, not subpages. Rename 'subpage' parameters to 'page'. > > Acked-by: David Hildenbrand (Arm) > Signed-off-by: Dev Jain This subpatch of your series LGTM! ;) so: Reviewed-by: Lorenzo Stoakes Thanks, Lorenzo > --- > 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 >