mm-shmemc-clean-up-comment-of-shmem_swapin_folio.patch removed from -mm tree
The quilt patch titled
Subject: mm/shmem.c: clean up comment of shmem_swapin_folio
has been removed from the -mm tree. Its filename was
mm-shmemc-clean-up-comment-of-shmem_swapin_folio.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: Miaohe Lin <[email protected]>
Subject: mm/shmem.c: clean up comment of shmem_swapin_folio
Date: Mon, 30 May 2022 19:58:41 +0800
shmem_swapin_folio has changed to use folio but comment still mentions page. Update the relevant comment accordingly as suggested by Naoya.
---
mm/shmem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
mm/shmem.c renamed from mm/shmem.c~mm-shmemc-clean-up-comment-of-shmem_swapin_folio +5 -5
@@ -1706,10 +1706,10 @@ static void shmem_set_folio_swapin_error }/* -* Swap in the page pointed to by *pagep. -* Caller has to make sure that *pagep contains a valid swapped page. -* Returns 0 and the page in pagep if success. On failure, returns the -* error code and NULL in *pagep. +* Swap in the folio pointed to by *foliop. +* Caller has to make sure that *foliop contains a valid swapped folio. +* Returns 0 and the folio in foliop if success. On failure, returns the +* error code and NULL in *foliop. */ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, struct folio **foliop, enum sgp_type sgp,
@@ -1749,7 +1749,7 @@ static int shmem_swapin_folio(struct ino } folio =page_folio (page); -/* We have to do this with page locked to prevent races */ +/* We have to do this with folio locked to prevent races */ folio_lock (folio); if (!folio_test_swapcache(folio) || folio_swap_entry(folio).val != swap.val ||
_
Patches currently in -mm which might be from [email protected] are
mm-reduce-the-rcu-lock-duration.patch mm-migration-remove-unneeded-lock-page-and-pagemovable-check.patch mm-migration-return-errno-when-isolate_huge_page-failed.patch mm-migration-fix-potential-pte_unmap-on-an-not-mapped-pte.patch mm-swapfile-make-security_vm_enough_memory_mm-work-as-expected.patch mm-swapfile-fix-possible-data-races-of-inuse_pages.patch mm-swap-remove-swap_cache_info-statistics.patch mm-vmscan-dont-try-to-reclaim-freed-folios.patch mm-page_alloc-minor-clean-up-for-memmap_init_compound.patch