diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
tree | db28291df94a2043af2123911984c5c173da4e6f /fs/btrfs/compression.c | |
parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) |
Merge branch 'next' 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 8ec5d86f1734..14f1c5a0b2d2 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c | |||
@@ -85,7 +85,8 @@ struct compressed_bio { | |||
85 | static inline int compressed_bio_size(struct btrfs_root *root, | 85 | static inline int compressed_bio_size(struct btrfs_root *root, |
86 | unsigned long disk_size) | 86 | unsigned long disk_size) |
87 | { | 87 | { |
88 | u16 csum_size = btrfs_super_csum_size(&root->fs_info->super_copy); | 88 | u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy); |
89 | |||
89 | return sizeof(struct compressed_bio) + | 90 | return sizeof(struct compressed_bio) + |
90 | ((disk_size + root->sectorsize - 1) / root->sectorsize) * | 91 | ((disk_size + root->sectorsize - 1) / root->sectorsize) * |
91 | csum_size; | 92 | csum_size; |