btrfs-progs: fix scrub error return from pthread_mutex_lock

[platform/upstream/btrfs-progs.git] / btrfs-list.c

diff --git a/btrfs-list.c b/btrfs-list.c
index 851c059..a748d5e 100644 (file)
--- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -564,13 +564,18 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri,
        while (1) {
                char *tmp;
                u64 next;
+               int add_len;
+
                /*
-               * ref_tree = 0 indicates the subvolumes
-               * has been deleted.
-               */
-               if (!found->ref_tree)
+                * ref_tree = 0 indicates the subvolumes
+                * has been deleted.
+                */
+               if (!found->ref_tree) {
+                       free(full_path);
                        return -ENOENT;
-               int add_len = strlen(found->path);
+               }
+
+               add_len = strlen(found->path);
 
                /* room for / and for null */
                tmp = malloc(add_len + 2 + len);
@@ -593,7 +598,7 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri,
 
                next = found->ref_tree;
 
-               if (next ==  top_id) {
+               if (next == top_id) {
                        ri->top_id = top_id;
                        break;
                }
@@ -612,8 +617,10 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri,
                * subvolume was deleted.
                */
                found = root_tree_search(rl, next);
-               if (!found)
+               if (!found) {
+                       free(full_path);
                        return -ENOENT;
+               }
        }
 
        ri->full_path = full_path;