Commit 3d243659 authored by Sidhartha Kumar's avatar Sidhartha Kumar Committed by Andrew Morton
Browse files

mm/memory: convert do_page_mkwrite() to use folios 

Saves one implicit call to compound_head().

Link: https://lkml.kernel.org/r/20230706163847.403202-1-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 3ce2c24c

mm/memory.c

+5 −5
Original line number Diff line number Diff line
@@ -2933,7 +2933,7 @@ static gfp_t __get_fault_gfp_mask(struct vm_area_struct *vma) 
static vm_fault_t do_page_mkwrite(struct vm_fault *vmf)

{

	vm_fault_t ret;

	struct page *page = vmf->page;

	struct folio *folio = page_folio(vmf->page);

	unsigned int old_flags = vmf->flags;



	vmf->flags = FAULT_FLAG_WRITE|FAULT_FLAG_MKWRITE;
@@ -2948,14 +2948,14 @@ static vm_fault_t do_page_mkwrite(struct vm_fault *vmf) 
	if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))

		return ret;

	if (unlikely(!(ret & VM_FAULT_LOCKED))) {

		lock_page(page);

		if (!page->mapping) {

			unlock_page(page);

		folio_lock(folio);

		if (!folio->mapping) {

			folio_unlock(folio);

			return 0; /* retry */

		}

		ret |= VM_FAULT_LOCKED;

	} else

		VM_BUG_ON_PAGE(!PageLocked(page), page);

		VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);

	return ret;

}