diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-04-25 21:02:04 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-04-25 21:02:04 -0700 |
| commit | 6b0dfa89570f16d9cb4df15069a363546f494f4a (patch) | |
| tree | 9b48dfca87a773b49b659477f19db23f030444f5 | |
| parent | 59c201ded13f216db963b1c8573c89abc711596b (diff) | |
| download | 25-new-6b0dfa89570f16d9cb4df15069a363546f494f4a.tar.gz | |
foo
| -rw-r--r-- | patches/khugepaged-use-a-folio-throughout-collapse_file.patch | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/patches/khugepaged-use-a-folio-throughout-collapse_file.patch b/patches/khugepaged-use-a-folio-throughout-collapse_file.patch index b041fe10d..2bc2f6f2f 100644 --- a/patches/khugepaged-use-a-folio-throughout-collapse_file.patch +++ b/patches/khugepaged-use-a-folio-throughout-collapse_file.patch @@ -8,6 +8,8 @@ of this function. There is no attempt in this patch to handle large folios that are smaller than a THP; that will have to wait for a future patch. +[willy@infradead.org: the unlikely() is embedded in IS_ERR()] + Link: https://lkml.kernel.org/r/ZhIWX8K0E2tSyMSr@casper.infradead.org Link: https://lkml.kernel.org/r/20240403171838.1445826-7-willy@infradead.org Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> @@ -79,7 +81,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> - page = find_lock_page(mapping, index); - if (unlikely(page == NULL)) { + folio = filemap_lock_folio(mapping, index); -+ if (unlikely(folio == NULL)) { ++ if (IS_ERR(folio)) { result = SCAN_FAIL; goto xa_unlocked; } |