Commit 76a51ac0 authored by Miklos Szeredi's avatar Miklos Szeredi

fuse: clear PG_uptodate when using a stolen page

Originally when a stolen page was inserted into fuse's page cache by
fuse_try_move_page(), it would be marked uptodate.  Then
fuse_readpages_end() would call SetPageUptodate() again on the already
uptodate page.

Commit 413e8f01 ("fuse: Convert fuse_readpages_end() to use
folio_end_read()") changed that by replacing the SetPageUptodate() +
unlock_page() combination with folio_end_read(), which does mostly the
same, except it sets the uptodate flag with an xor operation, which in the
above scenario resulted in the uptodate flag being cleared, which in turn
resulted in EIO being returned on the read.

Fix by clearing PG_uptodate instead of setting it in fuse_try_move_page(),
conforming to the expectation of folio_end_read().
Reported-by: default avatarJürg Billeter <j@bitron.ch>
Debugged-by: default avatarMatthew Wilcox <willy@infradead.org>
Fixes: 413e8f01 ("fuse: Convert fuse_readpages_end() to use folio_end_read()")
Cc: <stable@vger.kernel.org> # v6.10
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 3002240d
...@@ -775,7 +775,6 @@ static int fuse_check_folio(struct folio *folio) ...@@ -775,7 +775,6 @@ static int fuse_check_folio(struct folio *folio)
(folio->flags & PAGE_FLAGS_CHECK_AT_PREP & (folio->flags & PAGE_FLAGS_CHECK_AT_PREP &
~(1 << PG_locked | ~(1 << PG_locked |
1 << PG_referenced | 1 << PG_referenced |
1 << PG_uptodate |
1 << PG_lru | 1 << PG_lru |
1 << PG_active | 1 << PG_active |
1 << PG_workingset | 1 << PG_workingset |
...@@ -820,9 +819,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) ...@@ -820,9 +819,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
newfolio = page_folio(buf->page); newfolio = page_folio(buf->page);
if (!folio_test_uptodate(newfolio)) folio_clear_uptodate(newfolio);
folio_mark_uptodate(newfolio);
folio_clear_mappedtodisk(newfolio); folio_clear_mappedtodisk(newfolio);
if (fuse_check_folio(newfolio) != 0) if (fuse_check_folio(newfolio) != 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment