>From 891e085115a06f638e238bea267d520bb2432fba Mon Sep 17 00:00:00 2001 From: "Vishal Moola (Oracle)" Date: Mon, 8 Apr 2024 10:17:54 -0700 Subject: [PATCH 1/2] hugetlb: Simplify hugetlb_no_page() arguments To simplify the function arguments, as suggested by Oscar and Muchun. Suggested-by: Muchun Song Suggested-by: Oscar Salvador Signed-off-by: Vishal Moola (Oracle) --- mm/hugetlb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 456c81fbf8f5..05fe610f4699 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6186,11 +6186,11 @@ static bool hugetlb_pte_stable(struct hstate *h, struct mm_struct *mm, 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; @@ -6483,7 +6483,7 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, * 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; -- 2.43.0