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

btrfs-progs: check: use on-stack path buffer in fill_csum_tree_from_one_fs_root

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 5cbedb02e1
commit c050db55e2
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmds-check.c
View File

@ -10586,7 +10586,7 @@ static int fill_csum_tree_from_one_fs_root(struct btrfs_trans_handle *trans,
struct btrfs_root *csum_root, struct btrfs_root *csum_root,
struct btrfs_root *cur_root) struct btrfs_root *cur_root)
{ {
struct btrfs_path *path; struct btrfs_path path;
struct btrfs_key key; struct btrfs_key key;
struct extent_buffer *node; struct extent_buffer *node;
struct btrfs_file_extent_item *fi; struct btrfs_file_extent_item *fi;
@ -10596,30 +10596,25 @@ static int fill_csum_tree_from_one_fs_root(struct btrfs_trans_handle *trans,
int slot = 0; int slot = 0;
int ret = 0; int ret = 0;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
buf = malloc(cur_root->fs_info->csum_root->sectorsize); buf = malloc(cur_root->fs_info->csum_root->sectorsize);
if (!buf) { if (!buf)
ret = -ENOMEM; return -ENOMEM;
goto out;
}
btrfs_init_path(&path);
key.objectid = 0; key.objectid = 0;
key.offset = 0; key.offset = 0;
key.type = 0; key.type = 0;
ret = btrfs_search_slot(NULL, cur_root, &key, &path, 0, 0);
ret = btrfs_search_slot(NULL, cur_root, &key, path, 0, 0);
if (ret < 0) if (ret < 0)
goto out; goto out;
/* Iterate all regular file extents and fill its csum */ /* Iterate all regular file extents and fill its csum */
while (1) { while (1) {
btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]); btrfs_item_key_to_cpu(path.nodes[0], &key, path.slots[0]);
if (key.type != BTRFS_EXTENT_DATA_KEY) if (key.type != BTRFS_EXTENT_DATA_KEY)
goto next; goto next;
node = path->nodes[0]; node = path.nodes[0];
slot = path->slots[0]; slot = path.slots[0];
fi = btrfs_item_ptr(node, slot, struct btrfs_file_extent_item); fi = btrfs_item_ptr(node, slot, struct btrfs_file_extent_item);
if (btrfs_file_extent_type(node, fi) != BTRFS_FILE_EXTENT_REG) if (btrfs_file_extent_type(node, fi) != BTRFS_FILE_EXTENT_REG)
goto next; goto next;
@ -10636,7 +10631,7 @@ next:
* TODO: if next leaf is corrupted, jump to nearest next valid * TODO: if next leaf is corrupted, jump to nearest next valid
* leaf. * leaf.
*/ */
ret = btrfs_next_item(cur_root, path); ret = btrfs_next_item(cur_root, &path);
if (ret < 0) if (ret < 0)
goto out; goto out;
if (ret > 0) { if (ret > 0) {
@ -10646,7 +10641,7 @@ next:
} }
out: out:
btrfs_free_path(path); btrfs_release_path(&path);
free(buf); free(buf);
return ret; return ret;
} }