Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 023e9a0b authored by Alexander Winkowski's avatar Alexander Winkowski Committed by basamaryan
Browse files

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



This reverts commit b4e44251.

Change-Id: I6d083e1e4a70a352cdf8162e72c1f3bfb1cc0b64
Signed-off-by: default avatarAlexander Winkowski <dereference23@outlook.com>
parent d107078f

mm/filemap.c

+2 −7
Original line number Diff line number Diff line
@@ -2503,14 +2503,11 @@ int 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;
@@ -2542,8 +2539,6 @@ int filemap_fault(struct vm_fault *vmf) 
		return VM_FAULT_LOCKED;

page_unlock:

		unlock_page(page);

page_put:

		put_page(page);

		return VM_FAULT_RETRY;

	}