Skip to content

Commit

Permalink
mm/memory: convert do_read_fault() to use folios
Browse files Browse the repository at this point in the history
Saves one implicit call to compound_head().

Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Sidhartha Kumar <[email protected]>
Reviewed-by: Matthew Wilcox (Oracle) <[email protected]>
Reviewed-by: ZhangPeng <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
  • Loading branch information
sidkumar99 authored and akpm00 committed Aug 18, 2023
1 parent 6f609b7 commit 22d1e68
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions mm/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -4536,6 +4536,7 @@ static inline bool should_fault_around(struct vm_fault *vmf)
static vm_fault_t do_read_fault(struct vm_fault *vmf)
{
vm_fault_t ret = 0;
struct folio *folio;

/*
* Let's call ->map_pages() first and use ->fault() as fallback
Expand All @@ -4553,9 +4554,10 @@ static vm_fault_t do_read_fault(struct vm_fault *vmf)
return ret;

ret |= finish_fault(vmf);
unlock_page(vmf->page);
folio = page_folio(vmf->page);
folio_unlock(folio);
if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))
put_page(vmf->page);
folio_put(folio);
return ret;
}

Expand Down

0 comments on commit 22d1e68

Please sign in to comment.