From: Matthew Wilcox (Oracle) <willy@infradead.org>
Date: Thu, 2 Apr 2020 04:04:53 +0000 (-0700)
Subject: mm/filemap.c: use vm_fault error code directly
X-Git-Tag: v5.7-rc1~124^2~122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e520e932dcc607fc857d27ddd98482fcaf090d7a;p=thirdparty%2Fkernel%2Flinux.git

mm/filemap.c: use vm_fault error code directly

Use VM_FAULT_OOM instead of indirecting through vmf_error(-ENOMEM).

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Link: http://lkml.kernel.org/r/20200318140253.6141-2-willy@infradead.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/filemap.c b/mm/filemap.c
index 385826aa73d76..f62aa9569e483 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2490,7 +2490,7 @@ retry_find:
 		if (!page) {
 			if (fpin)
 				goto out_retry;
-			return vmf_error(-ENOMEM);
+			return VM_FAULT_OOM;
 		}
 	}