diff options
| author | Qu Wenruo <wqu@suse.com> | 2018-03-30 13:48:56 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-04-24 13:00:11 +0200 |
| commit | 47c694b0f4afa4fabf1a2013b9f9514a832898f7 (patch) | |
| tree | 6c1ab83390cae8dfbc7dc1f9d19e851911027028 /check | |
| parent | f96ca97fb451801d899650a4d03f6a96fa8c59fb (diff) | |
btrfs-progs: Unify btrfs_leaf_free_space() parameter with kernel
Instead of struct btrfs_root, use struct btrfs_fs_info, since nodesize
is now a per-fs setting, and with the need to pass a @root, caller don't
need to wonder which root should be passed.
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'check')
| -rw-r--r-- | check/main.c | 2 | ||||
| -rw-r--r-- | check/mode-lowmem.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/check/main.c b/check/main.c index 15c94543..c4a1801f 100644 --- a/check/main.c +++ b/check/main.c @@ -5970,7 +5970,7 @@ static int run_next_block(struct btrfs_root *root, goto out; if (btrfs_is_leaf(buf)) { - btree_space_waste += btrfs_leaf_free_space(root, buf); + btree_space_waste += btrfs_leaf_free_space(fs_info, buf); for (i = 0; i < nritems; i++) { struct btrfs_file_extent_item *fi; diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index dac3201b..bfe45aba 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -390,7 +390,7 @@ static void account_bytes(struct btrfs_root *root, struct btrfs_path *path, total_extent_tree_bytes += eb->len; if (level == 0) { - btree_space_waste += btrfs_leaf_free_space(root, eb); + btree_space_waste += btrfs_leaf_free_space(root->fs_info, eb); } else { free_nrs = (BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) - btrfs_header_nritems(eb)); |