Revert "ANDROID: mm/filemap: Fix missing put_page() for speculative page fault"

This reverts commit 290d702383.

Change-Id: I6d083e1e4a70a352cdf8162e72c1f3bfb1cc0b64
Signed-off-by: Alexander Winkowski <dereference23@outlook.com>
This commit is contained in:
Alexander Winkowski 2024-01-12 04:50:54 +00:00
commit 2673354abe
No known key found for this signature in database
GPG key ID: 72762A66704CDE44

View file

@ -2663,14 +2663,11 @@ vm_fault_t filemap_fault(struct vm_fault *vmf)
if (vmf->flags & FAULT_FLAG_SPECULATIVE) {
page = find_get_page(mapping, offset);
if (unlikely(!page))
if (unlikely(!page) || unlikely(PageReadahead(page)))
return VM_FAULT_RETRY;
if (unlikely(PageReadahead(page)))
goto page_put;
if (!trylock_page(page))
goto page_put;
return VM_FAULT_RETRY;
if (unlikely(compound_head(page)->mapping != mapping))
goto page_unlock;
@ -2702,8 +2699,6 @@ vm_fault_t filemap_fault(struct vm_fault *vmf)
return VM_FAULT_LOCKED;
page_unlock:
unlock_page(page);
page_put:
put_page(page);
return VM_FAULT_RETRY;
}