The quilt patch titled
Subject: squashfs: fix "convert squashfs_fill_page() to take a folio"
has been removed from the -mm tree. Its filename was
squashfs-convert-squashfs_fill_page-to-take-a-folio-fix.patch
This patch was dropped because it was folded into squashfs-convert-squashfs_fill_page-to-take-a-folio.patch
------------------------------------------------------
From: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx>
Subject: squashfs: fix "convert squashfs_fill_page() to take a folio"
Date: Fri, 10 Jan 2025 16:32:58 +0000
I got the polarity of "uptodate" wrong. Rename it. Thanks to Ryan for
testing; please fold into above named patch, and he'd like you to add
Link: https://lkml.kernel.org/r/20250110163300.3346321-2-willy@xxxxxxxxxxxxx
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Tested-by: Ryan Roberts <ryan.roberts@xxxxxxx>
Cc: Phillip Lougher <phillip@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/squashfs/file.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/fs/squashfs/file.c~squashfs-convert-squashfs_fill_page-to-take-a-folio-fix
+++ a/fs/squashfs/file.c
@@ -400,7 +400,7 @@ void squashfs_copy_cache(struct folio *f
bytes -= PAGE_SIZE, offset += PAGE_SIZE) {
struct folio *push_folio;
size_t avail = buffer ? min(bytes, PAGE_SIZE) : 0;
- bool uptodate = true;
+ bool updated = false;
TRACE("bytes %zu, i %d, available_bytes %zu\n", bytes, i, avail);
@@ -415,9 +415,9 @@ void squashfs_copy_cache(struct folio *f
if (folio_test_uptodate(push_folio))
goto skip_folio;
- uptodate = squashfs_fill_page(push_folio, buffer, offset, avail);
+ updated = squashfs_fill_page(push_folio, buffer, offset, avail);
skip_folio:
- folio_end_read(push_folio, uptodate);
+ folio_end_read(push_folio, updated);
if (i != folio->index)
folio_put(push_folio);
}
_
Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are
mm-page_alloc-cache-page_zone-result-in-free_unref_page.patch
mm-make-alloc_pages_mpol-static.patch
mm-page_alloc-export-free_frozen_pages-instead-of-free_unref_page.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-post_alloc_hook.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-prep_new_page.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-get_page_from_freelist.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_cpuset_fallback.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_may_oom.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_direct_compact.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_direct_reclaim.patch
mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_slowpath.patch
mm-page_alloc-move-set_page_refcounted-to-end-of-__alloc_pages.patch
mm-page_alloc-add-__alloc_frozen_pages.patch
mm-mempolicy-add-alloc_frozen_pages.patch
slab-allocate-frozen-pages.patch
mm-remove-pagetranstail.patch
ocfs2-handle-a-symlink-read-error-correctly.patch
ocfs2-convert-ocfs2_page_mkwrite-to-use-a-folio.patch
ocfs2-pass-mmap_folio-around-instead-of-mmap_page.patch
ocfs2-convert-ocfs2_read_inline_data-to-take-a-folio.patch
ocfs2-use-a-folio-in-ocfs2_fast_symlink_read_folio.patch
ocfs2-remove-ocfs2_start_walk_page_trans-prototype.patch
iov_iter-remove-setting-of-page-index.patch
squashfs-use-a-folio-throughout-squashfs_read_folio.patch
squashfs-pass-a-folio-to-squashfs_readpage_fragment.patch
squashfs-convert-squashfs_readpage_block-to-take-a-folio.patch
squashfs-convert-squashfs_copy_cache-to-take-a-folio.patch
squashfs-convert-squashfs_fill_page-to-take-a-folio.patch
