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

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

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 7e47022599
commit f24d4d6847
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmds-check.c
View File

@ -2683,48 +2683,46 @@ out:
*/ */
static int find_normal_file_extent(struct btrfs_root *root, u64 ino) static int find_normal_file_extent(struct btrfs_root *root, u64 ino)
{ {
struct btrfs_path *path; struct btrfs_path path;
struct btrfs_key key; struct btrfs_key key;
struct btrfs_key found_key; struct btrfs_key found_key;
struct btrfs_file_extent_item *fi; struct btrfs_file_extent_item *fi;
u8 type; u8 type;
int ret = 0; int ret = 0;
path = btrfs_alloc_path(); btrfs_init_path(&path);
if (!path)
goto out;
key.objectid = ino; key.objectid = ino;
key.type = BTRFS_EXTENT_DATA_KEY; key.type = BTRFS_EXTENT_DATA_KEY;
key.offset = 0; key.offset = 0;
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
if (ret < 0) { if (ret < 0) {
ret = 0; ret = 0;
goto out; goto out;
} }
if (ret && path->slots[0] >= btrfs_header_nritems(path->nodes[0])) { if (ret && path.slots[0] >= btrfs_header_nritems(path.nodes[0])) {
ret = btrfs_next_leaf(root, path); ret = btrfs_next_leaf(root, &path);
if (ret) { if (ret) {
ret = 0; ret = 0;
goto out; goto out;
} }
} }
while (1) { while (1) {
btrfs_item_key_to_cpu(path->nodes[0], &found_key, btrfs_item_key_to_cpu(path.nodes[0], &found_key,
path->slots[0]); path.slots[0]);
if (found_key.objectid != ino || if (found_key.objectid != ino ||
found_key.type != BTRFS_EXTENT_DATA_KEY) found_key.type != BTRFS_EXTENT_DATA_KEY)
break; break;
fi = btrfs_item_ptr(path->nodes[0], path->slots[0], fi = btrfs_item_ptr(path.nodes[0], path.slots[0],
struct btrfs_file_extent_item); struct btrfs_file_extent_item);
type = btrfs_file_extent_type(path->nodes[0], fi); type = btrfs_file_extent_type(path.nodes[0], fi);
if (type != BTRFS_FILE_EXTENT_INLINE) { if (type != BTRFS_FILE_EXTENT_INLINE) {
ret = 1; ret = 1;
goto out; goto out;
} }
} }
out: out:
btrfs_free_path(path); btrfs_release_path(&path);
return ret; return ret;
} }