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

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

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 919f914483
commit f2f7da66c5
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmds-check.c
View File

@ -7267,17 +7267,13 @@ static int delete_duplicate_records(struct btrfs_root *root,
{
struct btrfs_trans_handle *trans;
LIST_HEAD(delete_list);
struct btrfs_path *path;
struct btrfs_path path;
struct extent_record *tmp, *good, *n;
int nr_del = 0;
int ret = 0, err;
struct btrfs_key key;
path = btrfs_alloc_path();
if (!path) {
ret = -ENOMEM;
goto out;
}
btrfs_init_path(&path);
good = rec;
/* Find the record that covers all of the duplicates. */
@ -7329,16 +7325,16 @@ static int delete_duplicate_records(struct btrfs_root *root,
abort();
}
ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
ret = btrfs_search_slot(trans, root, &key, &path, -1, 1);
if (ret) {
if (ret > 0)
ret = -EINVAL;
break;
}
ret = btrfs_del_item(trans, root, path);
ret = btrfs_del_item(trans, root, &path);
if (ret)
break;
btrfs_release_path(path);
btrfs_release_path(&path);
nr_del++;
}
err = btrfs_commit_transaction(trans, root);
@ -7359,7 +7355,7 @@ out:
free(tmp);
}
btrfs_free_path(path);
btrfs_release_path(&path);
if (!ret && !nr_del)
rec->num_duplicates = 0;