Commit 22d1e68f authored by Sidhartha Kumar's avatar Sidhartha Kumar Committed by Andrew Morton
Browse files

mm/memory: convert do_read_fault() to use folios 

Saves one implicit call to compound_head().

Link: https://lkml.kernel.org/r/20230706163847.403202-4-sidhartha.kumar@oracle.com


Signed-off-by: default avatarSidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarZhangPeng <zhangpeng362@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 6f609b7e

mm/memory.c

+4 −2
Original line number Diff line number Diff line
@@ -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
@@ -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;

}