mm-swap-rename-subpage-page-in-folio_dup_swap-folio_put_swap.patch removed from -mm tree
The quilt patch titled
Subject: mm/swap: rename subpage->page in folio_dup_swap/folio_put_swap
has been removed from the -mm tree. Its filename was
mm-swap-rename-subpage-page-in-folio_dup_swap-folio_put_swap.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Dev Jain <[email protected]>
Subject: mm/swap: rename subpage->page in folio_dup_swap/folio_put_swap
Date: Tue, 23 Jun 2026 12:57:21 +0000
Patch series "mm: drop "sub" prefix from various places".
Patch 1 converts subpage->page : folios have pages, not subpages.
Patch 2 drops "sub" from a function and a variable because the context is clear enough.
This patch (of 2):
Folios have pages, not subpages. Rename 'subpage' parameters to 'page'.
---
mm/swap.h | 4 ++-- mm/swapfile.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-)
mm/swapfile.c renamed from mm/swapfile.c~mm-swap-rename-subpage-page-in-folio_dup_swap-folio_put_swap +8 -8
@@ -1781,7 +1781,7 @@ again:/** * 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 @@ again:* 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,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,/** * 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,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 ; }
mm/swap.h renamed from mm/swap.h~mm-swap-rename-subpage-page-in-folio_dup_swap-folio_put_swap +2 -2
@@ -230,8 +230,8 @@ extern int swap_retry_table_alloc(swp_en* 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,
_
Patches currently in -mm which might be from [email protected] are
mm-rmap-use-huge_ptep_get-in-try_to_unmap_one.patch mm-rmap-use-huge_ptep_get-in-try_to_migrate_one.patch mm-migrate-use-huge_ptep_get-in-remove_migration_pte.patch mm-page_vma_mapped-use-huge_ptep_get-for-hugetlb.patch mm-mprotect-use-huge_ptep_get-for-hugetlb.patch mm-rmap-convert-page-folio-for-hwpoison-checks.patch mm-rmap-add-try_to_unmap_hugetlb_one.patch mm-rmap-refactor-some-code-around-lazyfree-folio-unmapping.patch mm-rmap-refactor-anon-folio-unmap-in-try_to_unmap_one.patch mm-rmap-add-anon-folio-unmap-dispatcher.patch mm-memory-move-pte_install_uffd_wp_if_needed-into-memoryc.patch mm-memory-batch-set-uffd-wp-markers-during-zapping.patch mm-rmap-batch-unmap-file-folios-belonging-to-uffd-wp-vmas.patch