diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2012-01-11 09:54:49 +0800 |
|---|---|---|
| committer | Li Zefan <lizf@cn.fujitsu.com> | 2012-01-11 09:54:49 +0800 |
| commit | d25223a0d22f7ec4203ec285dc6e51f696591ba3 (patch) | |
| tree | f54428e64f692edfa5bf75f8eb301329e32a895f /fs/btrfs/compression.c | |
| parent | 396e6e49c58bb23d1814d3c240c736c9f01523c5 (diff) | |
| parent | 08c422c27f855d27b0b3d9fa30ebd938d4ae6f1f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs into for-linus
Diffstat (limited to 'fs/btrfs/compression.c')
| -rw-r--r-- | fs/btrfs/compression.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 8ec5d86f173..14f1c5a0b2d 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -85,7 +85,8 @@ struct compressed_bio { static inline int compressed_bio_size(struct btrfs_root *root, unsigned long disk_size) { - u16 csum_size = btrfs_super_csum_size(&root->fs_info->super_copy); + u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy); + return sizeof(struct compressed_bio) + ((disk_size + root->sectorsize - 1) / root->sectorsize) * csum_size; |