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

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

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 1e1bb046e5
commit 848e7f01ad
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmds-check.c
View File

@ -7627,7 +7627,7 @@ static int fixup_extent_flags(struct btrfs_fs_info *fs_info,
{ {
struct btrfs_trans_handle *trans; struct btrfs_trans_handle *trans;
struct btrfs_root *root = fs_info->extent_root; struct btrfs_root *root = fs_info->extent_root;
struct btrfs_path *path; struct btrfs_path path;
struct btrfs_extent_item *ei; struct btrfs_extent_item *ei;
struct btrfs_key key; struct btrfs_key key;
u64 flags; u64 flags;
@ -7642,32 +7642,27 @@ static int fixup_extent_flags(struct btrfs_fs_info *fs_info,
key.offset = rec->max_size; key.offset = rec->max_size;
} }
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
trans = btrfs_start_transaction(root, 0); trans = btrfs_start_transaction(root, 0);
if (IS_ERR(trans)) { if (IS_ERR(trans))
btrfs_free_path(path);
return PTR_ERR(trans); return PTR_ERR(trans);
}
ret = btrfs_search_slot(trans, root, &key, path, 0, 1); btrfs_init_path(&path);
ret = btrfs_search_slot(trans, root, &key, &path, 0, 1);
if (ret < 0) { if (ret < 0) {
btrfs_free_path(path); btrfs_release_path(&path);
btrfs_commit_transaction(trans, root); btrfs_commit_transaction(trans, root);
return ret; return ret;
} else if (ret) { } else if (ret) {
fprintf(stderr, "Didn't find extent for %llu\n", fprintf(stderr, "Didn't find extent for %llu\n",
(unsigned long long)rec->start); (unsigned long long)rec->start);
btrfs_free_path(path); btrfs_release_path(&path);
btrfs_commit_transaction(trans, root); btrfs_commit_transaction(trans, root);
return -ENOENT; return -ENOENT;
} }
ei = btrfs_item_ptr(path->nodes[0], path->slots[0], ei = btrfs_item_ptr(path.nodes[0], path.slots[0],
struct btrfs_extent_item); struct btrfs_extent_item);
flags = btrfs_extent_flags(path->nodes[0], ei); flags = btrfs_extent_flags(path.nodes[0], ei);
if (rec->flag_block_full_backref) { if (rec->flag_block_full_backref) {
fprintf(stderr, "setting full backref on %llu\n", fprintf(stderr, "setting full backref on %llu\n",
(unsigned long long)key.objectid); (unsigned long long)key.objectid);
@ -7677,9 +7672,9 @@ static int fixup_extent_flags(struct btrfs_fs_info *fs_info,
(unsigned long long)key.objectid); (unsigned long long)key.objectid);
flags &= ~BTRFS_BLOCK_FLAG_FULL_BACKREF; flags &= ~BTRFS_BLOCK_FLAG_FULL_BACKREF;
} }
btrfs_set_extent_flags(path->nodes[0], ei, flags); btrfs_set_extent_flags(path.nodes[0], ei, flags);
btrfs_mark_buffer_dirty(path->nodes[0]); btrfs_mark_buffer_dirty(path.nodes[0]);
btrfs_free_path(path); btrfs_release_path(&path);
return btrfs_commit_transaction(trans, root); return btrfs_commit_transaction(trans, root);
} }