diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2016-06-15 09:22:56 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-12-06 16:06:58 +0100 |
| commit | da17066c40472c2d6a1aab7bb0090c3d285531c9 (patch) | |
| tree | f51910799ffea3bfe5af34d009a2967b9e99e6ad /fs/btrfs/compression.c | |
| parent | f15376df0dc2b632eb689793a73d4adba8404987 (diff) | |
| download | blackbird-obmc-linux-da17066c40472c2d6a1aab7bb0090c3d285531c9.tar.gz blackbird-obmc-linux-da17066c40472c2d6a1aab7bb0090c3d285531c9.zip | |
btrfs: pull node/sector/stripe sizes out of root and into fs_info
We track the node sizes per-root, but they never vary from the values
in the superblock. This patch messes with the 80-column style a bit,
but subsequent patches to factor out root->fs_info into a convenience
variable fix it up again.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/compression.c')
| -rw-r--r-- | fs/btrfs/compression.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index ae4c000cbffc..e4a8c3a085db 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -91,7 +91,7 @@ static inline int compressed_bio_size(struct btrfs_root *root, u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy); return sizeof(struct compressed_bio) + - (DIV_ROUND_UP(disk_size, root->sectorsize)) * csum_size; + (DIV_ROUND_UP(disk_size, root->fs_info->sectorsize)) * csum_size; } static struct bio *compressed_bio_alloc(struct block_device *bdev, @@ -696,7 +696,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, BUG_ON(ret); /* -ENOMEM */ } sums += DIV_ROUND_UP(comp_bio->bi_iter.bi_size, - root->sectorsize); + root->fs_info->sectorsize); ret = btrfs_map_bio(root, comp_bio, mirror_num, 0); if (ret) { |
