UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: return void from csum_tree_block 

Now that csum_tree_block is not returning any errors, we can make
csum_tree_block return void and simplify callers.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2020-02-27 21:00:49 +01:00
parent e9be5a303d
commit c67b38925b
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/btrfs/disk-io.c
View File

@ -253,10 +253,8 @@ out:
/* /*
* Compute the csum of a btree block and store the result to provided buffer. * Compute the csum of a btree block and store the result to provided buffer.
*
* Returns error if the extent buffer cannot be mapped.
*/ */
static int csum_tree_block(struct extent_buffer *buf, u8 *result) static void csum_tree_block(struct extent_buffer *buf, u8 *result)
{ {
struct btrfs_fs_info *fs_info = buf->fs_info; struct btrfs_fs_info *fs_info = buf->fs_info;
const int num_pages = fs_info->nodesize >> PAGE_SHIFT; const int num_pages = fs_info->nodesize >> PAGE_SHIFT;
@ -276,8 +274,6 @@ static int csum_tree_block(struct extent_buffer *buf, u8 *result)
} }
memset(result, 0, BTRFS_CSUM_SIZE); memset(result, 0, BTRFS_CSUM_SIZE);
crypto_shash_final(shash, result); crypto_shash_final(shash, result);
return 0;
} }
/* /*
@ -528,8 +524,7 @@ static int csum_dirty_buffer(struct btrfs_fs_info *fs_info, struct page *page)
offsetof(struct btrfs_header, fsid), offsetof(struct btrfs_header, fsid),
BTRFS_FSID_SIZE) == 0); BTRFS_FSID_SIZE) == 0);
if (csum_tree_block(eb, result)) csum_tree_block(eb, result);
return -EINVAL;
if (btrfs_header_level(eb)) if (btrfs_header_level(eb))
ret = btrfs_check_node(eb); ret = btrfs_check_node(eb);
@ -640,9 +635,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio,
btrfs_set_buffer_lockdep_class(btrfs_header_owner(eb), btrfs_set_buffer_lockdep_class(btrfs_header_owner(eb),
eb, found_level); eb, found_level);
ret = csum_tree_block(eb, result); csum_tree_block(eb, result);
if (ret)
goto err;
if (memcmp_extent_buffer(eb, result, 0, csum_size)) { if (memcmp_extent_buffer(eb, result, 0, csum_size)) {
u32 val; u32 val;