btrfs: fix fsverify read error handling in end_page_read

Also clear the uptodate bit to make sure the page isn't seen as uptodate
in the page cache if fsverity verification fails.

Fixes: 146054090b08 ("btrfs: initial fsverity support")
CC: stable@vger.kernel.org # 5.15+
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 8e42ce48b52e4a71efbc7e33cd78217f58084357..a943a66224891a64c7de9e374d8edbb1fcfb8c63 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -497,12 +497,8 @@ static void end_page_read(struct page *page, bool uptodate, u64 start, u32 len)
        ASSERT(page_offset(page) <= start &&
               start + len <= page_offset(page) + PAGE_SIZE);
 
-       if (uptodate) {
-               if (!btrfs_verify_page(page, start)) {
-                       btrfs_page_set_error(fs_info, page, start, len);
-               } else {
-                       btrfs_page_set_uptodate(fs_info, page, start, len);
-               }
+       if (uptodate && btrfs_verify_page(page, start)) {
+               btrfs_page_set_uptodate(fs_info, page, start, len);
        } else {
                btrfs_page_clear_uptodate(fs_info, page, start, len);
                btrfs_page_set_error(fs_info, page, start, len);