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/transaction.c | |
| parent | f15376df0dc2b632eb689793a73d4adba8404987 (diff) | |
| download | blackbird-op-linux-da17066c40472c2d6a1aab7bb0090c3d285531c9.tar.gz blackbird-op-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/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index ab1fa59ef1c5..b8aaf1cc0314 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -497,7 +497,7 @@ start_transaction(struct btrfs_root *root, unsigned int num_items, * the appropriate flushing if need be. */ if (num_items > 0 && root != root->fs_info->chunk_root) { - qgroup_reserved = num_items * root->nodesize; + qgroup_reserved = num_items * root->fs_info->nodesize; ret = btrfs_qgroup_reserve_meta(root, qgroup_reserved); if (ret) return ERR_PTR(ret); @@ -507,7 +507,7 @@ start_transaction(struct btrfs_root *root, unsigned int num_items, * Do the reservation for the relocation root creation */ if (need_reserve_reloc_root(root)) { - num_bytes += root->nodesize; + num_bytes += root->fs_info->nodesize; reloc_reserved = true; } |
