#include <types/types.h>
#include <log/log.h>
#include <errno.h>
+#include <inttypes.h>
#include <string.h>
#include <sys/types.h>
task = dm_task_create(DM_DEVICE_STATUS);
if (!task) {
- pb_log("%s: Error creating task\n", __func__);
+ pb_log_fn("Error creating task\n");
return result;
}
task = dm_task_create(DM_DEVICE_SUSPEND);
if (!task) {
- pb_log("%s: Could not create dm_task\n", __func__);
+ pb_log_fn("Could not create dm_task\n");
return rc;
}
struct dm_task *task;
uint32_t cookie;
- pb_debug("%s: %lu %lu '%s' '%s'\n", __func__,
+ pb_debug("%s: %" PRIu64 " %" PRIu64 " '%s' '%s'\n", __func__,
target->start_sector, target->end_sector,
target->ttype, target->params);
goto out;
}
- name = talloc_asprintf(device, "%s-base", device->device->id);
+ name = talloc_asprintf(device, "pb-%s-base", device->device->id);
if (!name || run_create_task(name, &target))
goto out;
- device->ramdisk->base = talloc_asprintf(device, "/dev/mapper/%s-base",
+ device->ramdisk->base = talloc_asprintf(device, "/dev/mapper/pb-%s-base",
device->device->id);
if (!device->ramdisk->base) {
pb_log("Failed to track new device /dev/mapper/%s-base\n",
goto out;
}
- name = talloc_asprintf(device, "%s-origin", device->device->id);
+ name = talloc_asprintf(device, "pb-%s-origin", device->device->id);
if (!name || run_create_task(name, &target))
goto out;
device->ramdisk->origin = talloc_asprintf(device,
- "/dev/mapper/%s-origin",
+ "/dev/mapper/pb-%s-origin",
device->device->id);
if (!device->ramdisk->origin) {
pb_log("Failed to track new device /dev/mapper/%s-origin\n",
static int create_snapshot(struct discover_device *device)
{
struct target target;
+ char *name = NULL;
int rc = -1;
if (!device->ramdisk || !device->ramdisk->base ||
goto out;
}
- if (run_create_task(device->device->id, &target))
+ name = talloc_asprintf(device, "pb-%s", device->device->id);
+ if (!name || run_create_task(name, &target))
goto out;
- device->ramdisk->snapshot = talloc_asprintf(device, "/dev/mapper/%s",
+ device->ramdisk->snapshot = talloc_asprintf(device, "/dev/mapper/pb-%s",
device->device->id);
if (!device->ramdisk->snapshot) {
pb_log("Failed to track new device /dev/mapper/%s\n",
rc = 0;
out:
+ talloc_free(name);
talloc_free(target.params);
talloc_free(target.ttype);
return rc;
task = dm_task_create(DM_DEVICE_REMOVE);
if (!task) {
- pb_log("%s: could not create dm_task\n", __func__);
+ pb_log_fn("could not create dm_task\n");
return -1;
}
device->ramdisk->base);
}
if (!target.ttype || !target.params) {
- pb_log("%s: failed to allocate parameters\n", __func__);
+ pb_log_fn("failed to allocate parameters\n");
goto err1;
}
task = dm_task_create(DM_DEVICE_RELOAD);
if (!task) {
- pb_log("%s: Error creating task\n", __func__);
+ pb_log_fn("Error creating task\n");
goto err1;
}
if (!dm_task_add_target(task, target.start_sector, target.end_sector,
target.ttype, target.params)) {
- pb_log("%s: Failed to set target\n", __func__);
+ pb_log_fn("Failed to set target\n");
goto err2;
}
int devmapper_merge_snapshot(struct discover_device *device)
{
if (device->mounted) {
- pb_log("%s: %s still mounted\n", __func__, device->device->id);
+ pb_log_fn("%s still mounted\n", device->device->id);
return -1;
}