Skip to content

Commit 9a4ffa1

Browse files
adam900710kdave
authored andcommitted
btrfs: unify the error handling of btrfs_read_buffer()
There is one oddball error handling of btrfs_read_buffer(): ret = btrfs_read_buffer(tmp, gen, parent_level - 1, &first_key); if (!ret) { *eb_ret = tmp; return 0; } free_extent_buffer(tmp); btrfs_release_path(p); return -EIO; While all other call sites check the error first. Unify the behavior. Signed-off-by: Qu Wenruo <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 4eb150d commit 9a4ffa1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

fs/btrfs/ctree.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1438,13 +1438,13 @@ read_block_for_search(struct btrfs_root *root, struct btrfs_path *p,
14381438

14391439
/* now we're allowed to do a blocking uptodate check */
14401440
ret = btrfs_read_buffer(tmp, gen, parent_level - 1, &first_key);
1441-
if (!ret) {
1442-
*eb_ret = tmp;
1443-
return 0;
1441+
if (ret) {
1442+
free_extent_buffer(tmp);
1443+
btrfs_release_path(p);
1444+
return -EIO;
14441445
}
1445-
free_extent_buffer(tmp);
1446-
btrfs_release_path(p);
1447-
return -EIO;
1446+
*eb_ret = tmp;
1447+
return 0;
14481448
}
14491449

14501450
/*

0 commit comments

Comments
 (0)