diff options
| author | David Sterba <dsterba@suse.com> | 2020-06-30 17:42:23 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-12-08 15:54:01 +0100 |
| commit | 419b791ce76090aeaa598d7879579c236736e4ae (patch) | |
| tree | 98d615eddbb5fc4e964f2920f9de611bb7314d84 /fs/btrfs/check-integrity.c | |
| parent | 713cebfb98915201a43ff4d01b0dbafecd50d8ae (diff) | |
| download | linux-stable-419b791ce76090aeaa598d7879579c236736e4ae.tar.gz linux-stable-419b791ce76090aeaa598d7879579c236736e4ae.tar.bz2 linux-stable-419b791ce76090aeaa598d7879579c236736e4ae.zip | |
btrfs: check integrity: remove local copy of csum_size
The state structure unnecessarily stores copy of the checksum size, that
can be now easily obtained from fs_info.
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/check-integrity.c')
| -rw-r--r-- | fs/btrfs/check-integrity.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 288fd4bbe597..e90e92e4d0b8 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -233,7 +233,6 @@ struct btrfsic_stack_frame { struct btrfsic_state { u32 print_mask; int include_extent_data; - int csum_size; struct list_head all_blocks_list; struct btrfsic_block_hashtable block_hashtable; struct btrfsic_block_link_hashtable block_link_hashtable; @@ -660,8 +659,6 @@ static int btrfsic_process_superblock(struct btrfsic_state *state, return -1; } - state->csum_size = state->fs_info->csum_size; - for (pass = 0; pass < 3; pass++) { int num_copies; int mirror_num; @@ -1723,7 +1720,7 @@ static noinline_for_stack int btrfsic_test_for_metadata( crypto_shash_update(shash, data, sublen); } crypto_shash_final(shash, csum); - if (memcmp(csum, h->csum, state->csum_size)) + if (memcmp(csum, h->csum, fs_info->csum_size)) return 1; return 0; /* is metadata */ @@ -2797,7 +2794,6 @@ int btrfsic_mount(struct btrfs_fs_info *fs_info, state->fs_info = fs_info; state->print_mask = print_mask; state->include_extent_data = including_extent_data; - state->csum_size = 0; state->metablock_size = fs_info->nodesize; state->datablock_size = fs_info->sectorsize; INIT_LIST_HEAD(&state->all_blocks_list); |