Don't return w/ "metadump" still allocated
Signed-off-by: Eric Sandeen <sand...@redhat.com>
---
btrfs-image.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/btrfs-image.c b/btrfs-image.c
index a54e6c9..5b0af28 100644
--- a/btrfs-image.c
+++ b/btrfs-image.c
@@ -765,11 +765,11 @@ static int wait_for_worker(struct mdrestore_struct *mdres)
static int restore_metadump(const char *input, FILE *out, int num_threads)
{
- struct meta_cluster *cluster;
+ struct meta_cluster *cluster = NULL;
struct meta_cluster_header *header;
struct mdrestore_struct mdrestore;
u64 bytenr = 0;
- FILE *in;
+ FILE *in = NULL;
int ret;
if (!strcmp(input, "-")) {
@@ -797,14 +797,15 @@ static int restore_metadump(const char *input, FILE *out,
int num_threads)
if (le64_to_cpu(header->magic) != HEADER_MAGIC ||
le64_to_cpu(header->bytenr) != bytenr) {
fprintf(stderr, "bad header in metadump image\n");
- return 1;
+ ret = 1;
+ goto out;
}
ret = add_cluster(cluster, &mdrestore, &bytenr);
BUG_ON(ret);
wait_for_worker(&mdrestore);
}
-
+out:
mdrestore_destroy(&mdrestore);
free(cluster);
if (in != stdin)
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
