mm-hugetlb-convert-hugetlb_add_to_page_cache-to-take-in-a-folio.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: convert hugetlb_add_to_page_cache to take in a folio
has been removed from the -mm tree. Its filename was
mm-hugetlb-convert-hugetlb_add_to_page_cache-to-take-in-a-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: Sidhartha Kumar <[email protected]>
Subject: mm/hugetlb: convert hugetlb_add_to_page_cache to take in a folio
Date: Wed, 25 Jan 2023 09:05:35 -0800
Every caller of hugetlb_add_to_page_cache() is now passing in &folio->page, change the function to take in a folio directly and clean up the call sites.
---
fs/hugetlbfs/inode.c renamed from fs/hugetlbfs/inode.c~mm-hugetlb-convert-hugetlb_add_to_page_cache-to-take-in-a-folio +1 -1
@@ -871,7 +871,7 @@ static long hugetlbfs_fallocate(struct f }clear_huge_page (&folio->page, addr,pages_per_huge_page (h));__folio_mark_uptodate (folio); - error =hugetlb_add_to_page_cache (&folio->page, mapping, index); + error =hugetlb_add_to_page_cache (folio, mapping, index);if (unlikely (error)) {restore_reserve_on_error (h, &pseudo_vma, addr, folio);folio_put (folio);
include/linux/hugetlb.h renamed from include/linux/hugetlb.h~mm-hugetlb-convert-hugetlb_add_to_page_cache-to-take-in-a-folio +1 -1
@@ -723,7 +723,7 @@ struct folio *alloc_hugetlb_folio_nodema nodemask_t *nmask, gfp_t gfp_mask);struct folio *alloc_hugetlb_folio_vma (struct hstate *h,struct vm_area_struct *vma,unsigned long address); -int hugetlb_add_to_page_cache (struct page *page,struct address_space *mapping, +int hugetlb_add_to_page_cache (struct folio *folio,struct address_space *mapping,pgoff_t idx);void restore_reserve_on_error (struct hstate *h,struct vm_area_struct *vma,unsigned long address,struct folio *folio);
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-convert-hugetlb_add_to_page_cache-to-take-in-a-folio +4 -5
@@ -5662,10 +5662,9 @@ static bool hugetlbfs_pagecache_present(return present; } -int hugetlb_add_to_page_cache (struct page *page,struct address_space *mapping, +int hugetlb_add_to_page_cache (struct folio *folio,struct address_space *mapping,pgoff_t idx) { -struct folio *folio =page_folio (page);struct inode *inode = mapping->host;struct hstate *h =hstate_inode (inode);int err;
@@ -5677,7 +5676,7 @@ int hugetlb_add_to_page_cache(struct pag__folio_clear_locked (folio);return err; } -ClearHPageRestoreReserve (page); +folio_clear_hugetlb_restore_reserve (folio);/* * mark folio dirty so that it will not be removed from cache/file
@@ -5836,7 +5835,7 @@ static vm_fault_t hugetlb_no_page(struct new_folio = true;if (vma->vm_flags &VM_MAYSHARE ) { -int err =hugetlb_add_to_page_cache (&folio->page, mapping, idx); +int err =hugetlb_add_to_page_cache (folio, mapping, idx);if (err) {/* * err can't be -EEXIST which implies someone
@@ -6269,7 +6268,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_s* hugetlb_fault_mutex_table that here must be hold by * the caller. */ - ret =hugetlb_add_to_page_cache (&folio->page, mapping, idx); + ret =hugetlb_add_to_page_cache (folio, mapping, idx);if (ret) goto out_release_nounlock; folio_in_pagecache = true;
_
Patches currently in -mm which might be from [email protected] are