diff options
author | Nikolay Borisov <nborisov@suse.com> | 2018-02-07 11:19:10 +0200 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-03-26 15:09:29 +0200 |
commit | af89e0dc2ce3177d07c4af4028b8a7b88733d07e (patch) | |
tree | 68ff5d58bf2799696d63122bcb6b24b3ef256f88 /fs/btrfs/ordered-data.h | |
parent | 97dc231e8990d484874e75e9f30a2f11fcf035c2 (diff) | |
download | linux-stable-af89e0dc2ce3177d07c4af4028b8a7b88733d07e.tar.gz linux-stable-af89e0dc2ce3177d07c4af4028b8a7b88733d07e.tar.bz2 linux-stable-af89e0dc2ce3177d07c4af4028b8a7b88733d07e.zip |
btrfs: Don't hardcode the csum size in btrfs_ordered_sum_size
Currently the function uses a hardcoded value for the checksum size of
a sector. This is fine, given that we currently support only a single
algorithm, whose checksum is 4 bytes == sizeof(u32). Despite not
having other algorithms, btrfs' design supports using a different
algorithm whith different space requirements. To future-proof the code
query the size of the currently used algorithm from the in-memory copy
of the super block. No functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Su Yue <suy.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/ordered-data.h')
-rw-r--r-- | fs/btrfs/ordered-data.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h index 56c4c0ee6381..c53e2cfb72d9 100644 --- a/fs/btrfs/ordered-data.h +++ b/fs/btrfs/ordered-data.h @@ -151,7 +151,9 @@ static inline int btrfs_ordered_sum_size(struct btrfs_fs_info *fs_info, unsigned long bytes) { int num_sectors = (int)DIV_ROUND_UP(bytes, fs_info->sectorsize); - return sizeof(struct btrfs_ordered_sum) + num_sectors * sizeof(u32); + int csum_size = btrfs_super_csum_size(fs_info->super_copy); + + return sizeof(struct btrfs_ordered_sum) + num_sectors * csum_size; } static inline void |