From b023281d3b9e036f52f9ecee182443cce3f008c4 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 6 Nov 2015 18:20:52 +0100 Subject: [PATCH] btrfs-progs: calc-size: use on-stack buffer for a helper structure Signed-off-by: David Sterba --- btrfs-calc-size.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/btrfs-calc-size.c b/btrfs-calc-size.c index b84cda95..69564242 100644 --- a/btrfs-calc-size.c +++ b/btrfs-calc-size.c @@ -436,9 +436,8 @@ static void usage(void) int main(int argc, char **argv) { struct btrfs_key key; - struct fs_root *roots; + struct fs_root roots; struct btrfs_root *root; - size_t fs_roots_size = sizeof(struct fs_root); int opt; int ret = 0; @@ -482,12 +481,6 @@ int main(int argc, char **argv) exit(1); } - roots = malloc(fs_roots_size); - if (!roots) { - fprintf(stderr, "No memory\n"); - goto out; - } - printf("Calculating size of root tree\n"); key.objectid = BTRFS_ROOT_TREE_OBJECTID; ret = calc_root_size(root, &key, 0); @@ -506,15 +499,14 @@ int main(int argc, char **argv) if (ret) goto out; - roots[0].key.objectid = BTRFS_FS_TREE_OBJECTID; - roots[0].key.offset = (u64)-1; + roots.key.objectid = BTRFS_FS_TREE_OBJECTID; + roots.key.offset = (u64)-1; printf("Calculatin' size of fs tree\n"); - ret = calc_root_size(root, &roots[0].key, 1); + ret = calc_root_size(root, &roots.key, 1); if (ret) goto out; out: close_ctree(root); - free(roots); btrfs_close_all_devices(); return ret; }