btrfs: move setting the buffer uptodate out of validate_extent_buffer
authorChristoph Hellwig <hch@lst.de>
Wed, 3 May 2023 15:24:23 +0000 (17:24 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 19 Jun 2023 11:59:27 +0000 (13:59 +0200)
Setting the buffer uptodate in a function that is named as a validation
helper is a it confusing.  Move the call from validate_extent_buffer to
the one of its two callers that didn't already have a duplicate call
to set_extent_buffer_uptodate.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
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>
fs/btrfs/disk-io.c

index 16224fd8298723de9c48fd12dd70255158ee99c1..41045c900c2cef6eb91497db712ad0bf79be9258 100644 (file)
@@ -533,9 +533,7 @@ static int validate_extent_buffer(struct extent_buffer *eb,
        if (found_level > 0 && btrfs_check_node(eb))
                ret = -EIO;
 
-       if (!ret)
-               set_extent_buffer_uptodate(eb);
-       else
+       if (ret)
                btrfs_err(fs_info,
                "read time tree block corruption detected on logical %llu mirror %u",
                          eb->start, eb->read_mirror);
@@ -627,6 +625,8 @@ int btrfs_validate_metadata_buffer(struct btrfs_bio *bbio,
                goto err;
        }
        ret = validate_extent_buffer(eb, &bbio->parent_check);
+       if (!ret)
+               set_extent_buffer_uptodate(eb);
 err:
        if (ret) {
                /*