RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Btrfs-progs: refactor resolve_root() function a bit 

Don't pass a pointer to root_id to resolve_root().  It's always the same as
ri->root_id, passing a pointer hints that root_id can somehow change which is
not true.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2012-03-12 19:17:39 +02:00
parent 294c1bafd2
commit 55bf019ff4
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
btrfs-list.c
View File

@ -200,7 +200,7 @@ static int add_root(struct root_lookup *root_lookup,
* in by lookup_ino_path * in by lookup_ino_path
*/ */
static int resolve_root(struct root_lookup *rl, struct root_info *ri, static int resolve_root(struct root_lookup *rl, struct root_info *ri,
u64 *root_id, u64 *parent_id, u64 *top_id, char **path) u64 *parent_id, u64 *top_id, char **path)
{ {
char *full_path = NULL; char *full_path = NULL;
int len = 0; int len = 0;
@ -254,7 +254,6 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri,
} }
} }
*root_id = ri->root_id;
*path = full_path; *path = full_path;
return 0; return 0;
@ -692,23 +691,23 @@ int list_subvols(int fd, int print_parent)
n = rb_last(&root_lookup.root); n = rb_last(&root_lookup.root);
while (n) { while (n) {
struct root_info *entry; struct root_info *entry;
u64 root_id;
u64 level; u64 level;
u64 parent_id; u64 parent_id;
char *path; char *path;
entry = rb_entry(n, struct root_info, rb_node); entry = rb_entry(n, struct root_info, rb_node);
resolve_root(&root_lookup, entry, &root_id, &parent_id, resolve_root(&root_lookup, entry, &parent_id, &level, &path);
&level, &path);
if (print_parent) { if (print_parent) {
printf("ID %llu parent %llu top level %llu path %s\n", printf("ID %llu parent %llu top level %llu path %s\n",
(unsigned long long)root_id, (unsigned long long)entry->root_id,
(unsigned long long)parent_id, (unsigned long long)parent_id,
(unsigned long long)level, path); (unsigned long long)level, path);
} else { } else {
printf("ID %llu top level %llu path %s\n", printf("ID %llu top level %llu path %s\n",
(unsigned long long)root_id, (unsigned long long)entry->root_id,
(unsigned long long)level, path); (unsigned long long)level, path);
} }
free(path); free(path);
n = rb_prev(n); n = rb_prev(n);
} }
@ -914,17 +913,17 @@ char *path_for_root(int fd, u64 root)
n = rb_last(&root_lookup.root); n = rb_last(&root_lookup.root);
while (n) { while (n) {
struct root_info *entry; struct root_info *entry;
u64 root_id;
u64 parent_id; u64 parent_id;
u64 level; u64 level;
char *path; char *path;
entry = rb_entry(n, struct root_info, rb_node); entry = rb_entry(n, struct root_info, rb_node);
resolve_root(&root_lookup, entry, &root_id, &parent_id, &level, resolve_root(&root_lookup, entry, &parent_id, &level, &path);
&path); if (entry->root_id == root)
if (root_id == root)
ret_path = path; ret_path = path;
else else
free(path); free(path);
n = rb_prev(n); n = rb_prev(n);
} }