RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-26 21:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: tree-stats: use on-stack path buffer in calc_root_size

Browse Source 
We don't need to conserve stack space too much unlike kernel, also
remove one error condition.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-11-03 00:37:51 +01:00
parent 9733b4b926
commit 951e6276e6
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmds-inspect-tree-stats.c
View File

@ -313,7 +313,7 @@ static int calc_root_size(struct btrfs_root *tree_root, struct btrfs_key *key,
int find_inline) int find_inline)
{ {
struct btrfs_root *root; struct btrfs_root *root;
struct btrfs_path *path; struct btrfs_path path;
struct rb_node *n; struct rb_node *n;
struct timeval start, end, diff = {0}; struct timeval start, end, diff = {0};
struct root_stats stat; struct root_stats stat;
@ -327,31 +327,26 @@ static int calc_root_size(struct btrfs_root *tree_root, struct btrfs_key *key,
return 1; return 1;
} }
path = btrfs_alloc_path(); btrfs_init_path(&path);
if (!path) {
error("could not allocate path");
return 1;
}
memset(&stat, 0, sizeof(stat)); memset(&stat, 0, sizeof(stat));
level = btrfs_header_level(root->node); level = btrfs_header_level(root->node);
stat.lowest_bytenr = btrfs_header_bytenr(root->node); stat.lowest_bytenr = btrfs_header_bytenr(root->node);
stat.highest_bytenr = stat.lowest_bytenr; stat.highest_bytenr = stat.lowest_bytenr;
stat.min_cluster_size = (u64)-1; stat.min_cluster_size = (u64)-1;
stat.max_cluster_size = root->nodesize; stat.max_cluster_size = root->nodesize;
path->nodes[level] = root->node; path.nodes[level] = root->node;
if (gettimeofday(&start, NULL)) { if (gettimeofday(&start, NULL)) {
error("cannot get time: %s", strerror(errno)); error("cannot get time: %s", strerror(errno));
goto out; goto out;
} }
if (!level) { if (!level) {
ret = walk_leaf(root, path, &stat, find_inline); ret = walk_leaf(root, &path, &stat, find_inline);
if (ret) if (ret)
goto out; goto out;
goto out_print; goto out_print;
} }
ret = walk_nodes(root, path, &stat, level, find_inline); ret = walk_nodes(root, &path, &stat, level, find_inline);
if (ret) if (ret)
goto out; goto out;
if (gettimeofday(&end, NULL)) { if (gettimeofday(&end, NULL)) {
@ -417,13 +412,11 @@ out:
} }
/* /*
* We only use path to save node data in iterating, * We only use path to save node data in iterating, without holding
* without holding eb's ref_cnt in path. * eb's ref_cnt in path. Don't use btrfs_release_path() here, it will
* Don't use btrfs_free_path() here, it will free these * free these eb again, and cause many problems, as negative ref_cnt or
* eb again, and cause many problems, as negative ref_cnt * invalid memory access.
* or invalid memory access.
*/ */
free(path);
return ret; return ret;
} }