diff options
| author | David Sterba <dsterba@suse.com> | 2016-02-26 14:38:33 (GMT) |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-26 14:38:33 (GMT) |
| commit | f004fae0cfeb96d33240eb5471f14cb6fbbd4eea (patch) | |
| tree | 8a0cc3be4e031298ef1f6db573c5f57da333737e /fs/btrfs/ctree.h | |
| parent | 675d276b322b45e7bf7c616a2847bdc425745b99 (diff) | |
| parent | f827ba9a641b481f01d1bdc0771a7afc3776cc0b (diff) | |
| download | linux-f004fae0cfeb96d33240eb5471f14cb6fbbd4eea.tar.xz | |
Merge branch 'cleanups-4.6' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 38f34da..67fca26 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3490,8 +3490,7 @@ u64 btrfs_csum_bytes_to_leaves(struct btrfs_root *root, u64 csum_bytes); static inline u64 btrfs_calc_trans_metadata_size(struct btrfs_root *root, unsigned num_items) { - return (root->nodesize + root->nodesize * (BTRFS_MAX_LEVEL - 1)) * - 2 * num_items; + return root->nodesize * BTRFS_MAX_LEVEL * 2 * num_items; } /* |