summaryrefslogtreecommitdiff
path: root/kpartx
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2007-02-20 15:16:56 +0100
committerChristophe Varoqui <cvaroqui@zezette.localdomain>2007-05-21 23:13:22 +0200
commit78b50864bd144359d4bcad502912d3f9ffe7a249 (patch)
tree5633d24ffb0898fa1df9c79d03ab8157a692c93e /kpartx
parent50bf7205ff8459f5a77a863908d35f9dd25e398a (diff)
downloadmultipath-tools-78b50864bd144359d4bcad502912d3f9ffe7a249.tar.gz
multipath-tools-78b50864bd144359d4bcad502912d3f9ffe7a249.tar.bz2
multipath-tools-78b50864bd144359d4bcad502912d3f9ffe7a249.zip
kpartx: fix crash during boot
kpartx will crash during boot as device-mapper insists on freeing all passed memory upon exit. So we don't have to do it. Signed-off-by: Hannes Reinecke <hare@suse.de>
Diffstat (limited to 'kpartx')
-rw-r--r--kpartx/devmapper.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kpartx/devmapper.c b/kpartx/devmapper.c
index 5b27487..4b228ed 100644
--- a/kpartx/devmapper.c
+++ b/kpartx/devmapper.c
@@ -95,19 +95,16 @@ dm_addmap (int task, const char *name, const char *target,
}
sprintf(prefixed_uuid, UUID_PREFIX "%s", part, uuid);
if (!dm_task_set_uuid(dmt, prefixed_uuid))
- goto freeout;
+ goto addout;
}
dm_task_no_open_count(dmt);
r = dm_task_run (dmt);
- freeout:
- if (prefixed_uuid)
- free(prefixed_uuid);
-
addout:
dm_task_destroy (dmt);
+
return r;
}