Messages in this thread Patch in this message | | | From | Matthew Wilcox <> | Subject | [PATCH 02/11] thp: Change insert_pfn's return type to void | Date | Tue, 4 Aug 2015 15:57:56 -0400 |
| |
From: Matthew Wilcox <willy@linux.intel.com>
It would make more sense to have all the return values from vmf_insert_pfn_pmd() encoded in one place instead of having to follow the convention into insert_pfn(). Suggested by Jeff Moyer.
Signed-off-by: Matthew Wilcox <willy@linux.intel.com> --- mm/huge_memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 26d0fc1..5ffdcaa 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -837,7 +837,7 @@ int do_huge_pmd_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, return 0; } -static int insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, +static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmd, unsigned long pfn, pgprot_t prot, bool write) { struct mm_struct *mm = vma->vm_mm; @@ -855,7 +855,6 @@ static int insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, update_mmu_cache_pmd(vma, addr, pmd); } spin_unlock(ptl); - return VM_FAULT_NOPAGE; } int vmf_insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, @@ -877,7 +876,8 @@ int vmf_insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, return VM_FAULT_SIGBUS; if (track_pfn_insert(vma, &pgprot, pfn)) return VM_FAULT_SIGBUS; - return insert_pfn_pmd(vma, addr, pmd, pfn, pgprot, write); + insert_pfn_pmd(vma, addr, pmd, pfn, pgprot, write); + return VM_FAULT_NOPAGE; } int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm, -- 2.1.4
| |