On 10/01/2025 16:32, Matthew Wilcox (Oracle) wrote:
> 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
>
> Tested-by: Ryan Roberts <ryan.roberts@xxxxxxx>
This is missing the change to folio_end_read() and the change for IS_ERR() that
was in the version of the patch I tested. Just checking that those were handled
separately in a thread I'm not CCed on?
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
> ---
> fs/squashfs/file.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c
> index da25d6fa45ce..018f0053a4f5 100644
> --- a/fs/squashfs/file.c
> +++ b/fs/squashfs/file.c
> @@ -400,7 +400,7 @@ void squashfs_copy_cache(struct folio *folio,
> 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 *folio,
> 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);
> }
