[folded-merged] hugetlb-convert-hugetlb_no_page-to-use-struct-vm_fault-fix.patch removed from -mm tree

[folded-merged] hugetlb-convert-hugetlb_no_page-to-use-struct-vm_fault-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: hugetlb: simplify hugetlb_no_page() arguments
has been removed from the -mm tree.  Its filename was
     hugetlb-convert-hugetlb_no_page-to-use-struct-vm_fault-fix.patch

This patch was dropped because it was folded into hugetlb-convert-hugetlb_no_page-to-use-struct-vm_fault.patch

------------------------------------------------------
From: "Vishal Moola (Oracle)" <vishal.moola@gmail.com>
Subject: hugetlb: simplify hugetlb_no_page() arguments
Date: Mon, 8 Apr 2024 10:17:54 -0700

To simplify the function arguments, as suggested by Oscar and Muchun.

Link: https://lkml.kernel.org/r/ZhQtN8y5zud8iI1u@fedora
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Suggested-by: Muchun Song <muchun.song@linux.dev>
Suggested-by: Oscar Salvador <osalvador@suse.de>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/hugetlb.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/mm/hugetlb.c~hugetlb-convert-hugetlb_no_page-to-use-struct-vm_fault-fix
+++ a/mm/hugetlb.c
@@ -6188,11 +6188,11 @@ static bool hugetlb_pte_stable(struct hs
 	return same;
 }
 
-static vm_fault_t hugetlb_no_page(struct mm_struct *mm,
-			struct vm_area_struct *vma,
-			struct address_space *mapping,
+static vm_fault_t hugetlb_no_page(struct address_space *mapping,
 			struct vm_fault *vmf)
 {
+	struct vm_area_struct *vma = vmf->vma;
+	struct mm_struct *mm = vma->vm_mm;
 	struct hstate *h = hstate_vma(vma);
 	vm_fault_t ret = VM_FAULT_SIGBUS;
 	int anon_rmap = 0;
@@ -6489,7 +6489,7 @@ vm_fault_t hugetlb_fault(struct mm_struc
 		 * hugetlb_no_page will drop vma lock and hugetlb fault
 		 * mutex internally, which make us return immediately.
 		 */
-		return hugetlb_no_page(mm, vma, mapping, &vmf);
+		return hugetlb_no_page(mapping, &vmf);
 	}
 
 	ret = 0;
_

Patches currently in -mm which might be from vishal.moola@gmail.com are

hugetlb-convert-hugetlb_fault-to-use-struct-vm_fault.patch
hugetlb-convert-hugetlb_no_page-to-use-struct-vm_fault.patch
hugetlb-convert-hugetlb_wp-to-use-struct-vm_fault.patch
hugetlb-convert-hugetlb_wp-to-use-struct-vm_fault-fix.patch