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

btrfs-progs: convert: use on-stack path buffer in link_subvol

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 c0807cbfc4
commit 33f07b0d03
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
btrfs-convert.c
View File

@ -1075,7 +1075,7 @@ static struct btrfs_root* link_subvol(struct btrfs_root *root,
struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_fs_info *fs_info = root->fs_info;
struct btrfs_root *tree_root = fs_info->tree_root; struct btrfs_root *tree_root = fs_info->tree_root;
struct btrfs_root *new_root = NULL; struct btrfs_root *new_root = NULL;
struct btrfs_path *path; struct btrfs_path path;
struct btrfs_inode_item *inode_item; struct btrfs_inode_item *inode_item;
struct extent_buffer *leaf; struct extent_buffer *leaf;
struct btrfs_key key; struct btrfs_key key;
@ -1090,28 +1090,25 @@ static struct btrfs_root* link_subvol(struct btrfs_root *root,
if (len == 0 || len > BTRFS_NAME_LEN) if (len == 0 || len > BTRFS_NAME_LEN)
return NULL; return NULL;
path = btrfs_alloc_path(); btrfs_init_path(&path);
if (!path)
return NULL;
key.objectid = dirid; key.objectid = dirid;
key.type = BTRFS_DIR_INDEX_KEY; key.type = BTRFS_DIR_INDEX_KEY;
key.offset = (u64)-1; key.offset = (u64)-1;
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) {
error("search for DIR_INDEX dirid %llu failed: %d", error("search for DIR_INDEX dirid %llu failed: %d",
(unsigned long long)dirid, ret); (unsigned long long)dirid, ret);
goto fail; goto fail;
} }
if (path->slots[0] > 0) { if (path.slots[0] > 0) {
path->slots[0]--; path.slots[0]--;
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.objectid == dirid && key.type == BTRFS_DIR_INDEX_KEY) if (key.objectid == dirid && key.type == BTRFS_DIR_INDEX_KEY)
index = key.offset + 1; index = key.offset + 1;
} }
btrfs_release_path(path); btrfs_release_path(&path);
trans = btrfs_start_transaction(root, 1); trans = btrfs_start_transaction(root, 1);
if (!trans) { if (!trans) {
@ -1123,14 +1120,14 @@ static struct btrfs_root* link_subvol(struct btrfs_root *root,
key.offset = 0; key.offset = 0;
key.type = BTRFS_INODE_ITEM_KEY; key.type = BTRFS_INODE_ITEM_KEY;
ret = btrfs_lookup_inode(trans, root, path, &key, 1); ret = btrfs_lookup_inode(trans, root, &path, &key, 1);
if (ret) { if (ret) {
error("search for INODE_ITEM %llu failed: %d", error("search for INODE_ITEM %llu failed: %d",
(unsigned long long)dirid, ret); (unsigned long long)dirid, ret);
goto fail; goto fail;
} }
leaf = path->nodes[0]; leaf = path.nodes[0];
inode_item = btrfs_item_ptr(leaf, path->slots[0], inode_item = btrfs_item_ptr(leaf, path.slots[0],
struct btrfs_inode_item); struct btrfs_inode_item);
key.objectid = root_objectid; key.objectid = root_objectid;
@ -1155,7 +1152,7 @@ static struct btrfs_root* link_subvol(struct btrfs_root *root,
btrfs_set_inode_size(leaf, inode_item, len * 2 + btrfs_set_inode_size(leaf, inode_item, len * 2 +
btrfs_inode_size(leaf, inode_item)); btrfs_inode_size(leaf, inode_item));
btrfs_mark_buffer_dirty(leaf); btrfs_mark_buffer_dirty(leaf);
btrfs_release_path(path); btrfs_release_path(&path);
/* add the backref first */ /* add the backref first */
ret = btrfs_add_root_ref(trans, tree_root, root_objectid, ret = btrfs_add_root_ref(trans, tree_root, root_objectid,
@ -1190,7 +1187,7 @@ static struct btrfs_root* link_subvol(struct btrfs_root *root,
new_root = NULL; new_root = NULL;
} }
fail: fail:
btrfs_free_path(path); btrfs_init_path(&path);
return new_root; return new_root;
} }