libdevmapper limits allowed characters for device name. Character whitelist: 0-9, A-Z, a-z, #+-.:=@_. LDM partition name is composed of disk group name and partition name. Disk group is named after the machine, with a "DgN" suffix; partition name is a disk name with a numerical suffix - partition number within a disk. So, the only variable part which might contain invalid characters is Windows machine name. Therefore g_uri_escape_string function was used to sanitise partition name. However its usage looks artificial because it is unclear either g_uri_escape_string will sanitise invalid characters defined by libdevmapper. Most likely libdevmapper v1.0 didn't provide any way to do that job on its own. Now when we switched to v1.02 of the library we can offload this work. First of all explicitly set mangling mode for devmapper library to DM_STRING_MANGLING_AUTO (mangle only if not already mangled with hex). So, we can set device name as is and the library will mangle name for us. After that we can retrieve mangled name back. --- src/ldm.c | 59 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/src/ldm.c b/src/ldm.c index 5c570a5..c701cbd 100644 --- a/src/ldm.c +++ b/src/ldm.c @@ -292,6 +292,8 @@ ldm_init(LDM * const o) { o->priv = LDM_GET_PRIVATE(o); bzero(o->priv, sizeof(*o->priv)); + + dm_set_name_mangling_mode(DM_STRING_MANGLING_AUTO); } static void @@ -2378,6 +2380,17 @@ ldm_partition_get_disk(LDMPartition * const o) return o->priv->disk; } +static GString * +_dm_part_name(const LDMPartitionPrivate * const part) +{ + const LDMDiskPrivate * const disk = part->disk->priv; + + GString * name = g_string_new(""); + g_string_printf(name, "ldm_part_%s_%s", disk->dgname, part->name); + + return name; +} + static GString * _dm_vol_name(const LDMVolumePrivate * const vol) { @@ -2492,10 +2505,12 @@ _find_device_tree_node(struct dm_tree * const tree, gboolean _dm_create(const gchar * const name, uint32_t udev_cookie, const guint n_targets, const struct dm_target * const targets, - GError ** const err) + GString **mangled_name, GError ** const err) { gboolean r = TRUE; + if (mangled_name) *mangled_name = NULL; + struct dm_task * const task = dm_task_create(DM_DEVICE_CREATE); if (!task) { g_set_error(err, LDM_ERROR, LDM_ERROR_EXTERNAL, @@ -2540,6 +2555,12 @@ _dm_create(const gchar * const name, uint32_t udev_cookie, r = FALSE; goto out; } + if (mangled_name) { + char *tmp = dm_task_get_name_mangled(task); + *mangled_name = g_string_new(tmp); + dm_free(tmp); + } + out: dm_task_destroy(task); return r; @@ -2613,28 +2634,16 @@ _dm_create_part(const LDMPartitionPrivate * const part, uint32_t cookie, g_string_printf(target.params, "%s %" PRIu64, disk->device, disk->data_start + part->start); - /* Ensure we sanitise table names */ - char * dgname_esc = - g_uri_escape_string(disk->dgname, - G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT, - FALSE); - char * partname_esc = - g_uri_escape_string(part->name, - G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT, - FALSE); - - GString *name = g_string_new(""); - g_string_printf(name, "ldm_part_%s_%s", dgname_esc, partname_esc); - g_free(dgname_esc); - g_free(partname_esc); - - if (!_dm_create(name->str, cookie, 1, &target, err)) { - g_string_free(name, TRUE); - name = NULL; + GString *name = _dm_part_name(part); + GString *mangled_name = NULL; + + if (!_dm_create(name->str, cookie, 1, &target, &mangled_name, err)) { + mangled_name = NULL; } + g_string_free(name, TRUE); g_string_free(target.params, TRUE); - return name; + return mangled_name; } static GString * @@ -2687,7 +2696,7 @@ _dm_create_spanned(const LDMVolumePrivate * const vol, GError ** const err) name = _dm_vol_name(vol); - if (!_dm_create(name->str, cookie, vol->parts->len, targets, err)) { + if (!_dm_create(name->str, cookie, vol->parts->len, targets, NULL, err)) { g_string_free(name, TRUE); name = NULL; } @@ -2744,7 +2753,7 @@ _dm_create_striped(const LDMVolumePrivate * const vol, GError ** const err) name = _dm_vol_name(vol); - if (!_dm_create(name->str, cookie, 1, &target, err)) { + if (!_dm_create(name->str, cookie, 1, &target, NULL, err)) { g_string_free(name, TRUE); name = NULL; } @@ -2818,7 +2827,7 @@ _dm_create_mirrored(const LDMVolumePrivate * const vol, GError ** const err) name = _dm_vol_name(vol); - if (!_dm_create(name->str, cookie, 1, &target, err)) { + if (!_dm_create(name->str, cookie, 1, &target, NULL, err)) { g_string_free(name, TRUE); name = NULL; } @@ -2906,7 +2915,7 @@ _dm_create_raid5(const LDMVolumePrivate * const vol, GError ** const err) name = _dm_vol_name(vol); - if (!_dm_create(name->str, cookie, 1, &target, err)) { + if (!_dm_create(name->str, cookie, 1, &target, NULL, err)) { g_string_free(name, TRUE); name = NULL; goto out; } @@ -2986,7 +2995,7 @@ ldm_volume_dm_create(const LDMVolume * const o, GString **created, return TRUE; } dm_tree_free(tree); tree = NULL; - g_string_free(name, TRUE); + g_string_free(name, TRUE); name = NULL; switch (vol->type) { case LDM_VOLUME_TYPE_SIMPLE: -- 2.17.0

Device mapper device UUID (alongside with device name) is an unique characteristic of device. However libldm didn't set device UUID. Also "dmsetup" user space tool has "mangle" command which issue a warning if device doesn't have UUID. Let's set UUID for created devices to be consistent with DM devices created by other subsystems. Device mapper device UUID is an arbitrary string conventionally prefixed with UUID prefix which is a short capitalised prefix indicating the subsystem that is managing the devices, e.g. "LVM-" or "MPATH-". "LDM-" prefix is used for device created by libldm. Partition UUID is composed in a form "LDM-<partition_name>-<disk_guid>". Disk GUID should be unique a cross disks and LDM partition name is unique within a disk. So, overall generated UUID should be unique. Volume UUID is composed in a form "LDM-<volume_name>-<volume_guid>". Volume GUID should be unique a cross all LDM volumes. So, overall generated UUID should be unique (despite LDM volume name). --- src/ldm.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 7 deletions(-) diff --git a/src/ldm.c b/src/ldm.c index c701cbd..02378f8 100644 --- a/src/ldm.c +++ b/src/ldm.c @@ -39,6 +39,8 @@ #include "gpt.h" #include "ldm.h" +#define DM_UUID_PREFIX "LDM-" + #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-" \ "%02x%02x-%02x%02x%02x%02x%02x%02x" #define UUID_VALS(uuid) (uuid)[0], (uuid)[1], (uuid)[2], (uuid)[3], \ @@ -294,6 +296,7 @@ ldm_init(LDM * const o) bzero(o->priv, sizeof(*o->priv)); dm_set_name_mangling_mode(DM_STRING_MANGLING_AUTO); + dm_set_uuid_prefix(DM_UUID_PREFIX); } static void @@ -2391,6 +2394,21 @@ _dm_part_name(const LDMPartitionPrivate * const part) return name; } +static GString * +_dm_part_uuid(const LDMPartitionPrivate * const part) +{ + const LDMDiskPrivate * const disk = part->disk->priv; + + char ldm_disk_guid[37]; + uuid_unparse_lower(disk->guid, ldm_disk_guid); + + GString * dm_uuid = g_string_new(""); + g_string_printf(dm_uuid, "%s%s-%s", + DM_UUID_PREFIX, part->name, ldm_disk_guid); + + return dm_uuid; +} + static GString * _dm_vol_name(const LDMVolumePrivate * const vol) { @@ -2399,6 +2417,19 @@ _dm_vol_name(const LDMVolumePrivate * const vol) return r; } +static GString * +_dm_vol_uuid(const LDMVolumePrivate * const vol) +{ + char ldm_vol_uuid[37]; + uuid_unparse_lower(vol->guid, ldm_vol_uuid); + + GString * dm_uuid = g_string_new(""); + g_string_printf(dm_uuid, "%s%s-%s", + DM_UUID_PREFIX, vol->name, ldm_vol_uuid); + + return dm_uuid; +} + /* We catch log messages generated by device mapper with errno != 0 and store * them here */ static int _dm_err_last_level = 0; @@ -2503,8 +2534,9 @@ _find_device_tree_node(struct dm_tree * const tree, } gboolean -_dm_create(const gchar * const name, uint32_t udev_cookie, - const guint n_targets, const struct dm_target * const targets, +_dm_create(const gchar * const name, const gchar * const uuid, + uint32_t udev_cookie, const guint n_targets, + const struct dm_target * const targets, GString **mangled_name, GError ** const err) { gboolean r = TRUE; @@ -2526,6 +2558,13 @@ _dm_create(const gchar * const name, uint32_t udev_cookie, r = FALSE; goto out; } + if (!dm_task_set_uuid(task, uuid)) { + g_set_error(err, LDM_ERROR, LDM_ERROR_EXTERNAL, + "DM_DEVICE_CREATE: dm_task_set_uuid(%s) failed: %s", + uuid, _dm_err_last_msg); + r = FALSE; goto out; + } + for (guint i = 0; i < n_targets; i++) { const struct dm_target * const target = &targets[i]; @@ -2635,14 +2674,18 @@ _dm_create_part(const LDMPartitionPrivate * const part, uint32_t cookie, disk->device, disk->data_start + part->start); GString *name = _dm_part_name(part); + GString *uuid = _dm_part_uuid(part); GString *mangled_name = NULL; - if (!_dm_create(name->str, cookie, 1, &target, &mangled_name, err)) { + if (!_dm_create(name->str, uuid->str, cookie, 1, &target, + &mangled_name, err)) { mangled_name = NULL; } g_string_free(name, TRUE); + g_string_free(uuid, TRUE); g_string_free(target.params, TRUE); + return mangled_name; } @@ -2695,12 +2738,15 @@ _dm_create_spanned(const LDMVolumePrivate * const vol, GError ** const err) } name = _dm_vol_name(vol); + GString *uuid = _dm_vol_uuid(vol); - if (!_dm_create(name->str, cookie, vol->parts->len, targets, NULL, err)) { + if (!_dm_create(name->str, uuid->str, cookie, vol->parts->len, targets, + NULL, err)) { g_string_free(name, TRUE); name = NULL; } + g_string_free(uuid, TRUE); dm_udev_wait(cookie); out: @@ -2752,12 +2798,14 @@ _dm_create_striped(const LDMVolumePrivate * const vol, GError ** const err) } name = _dm_vol_name(vol); + GString *uuid = _dm_vol_uuid(vol); - if (!_dm_create(name->str, cookie, 1, &target, NULL, err)) { + if (!_dm_create(name->str, uuid->str, cookie, 1, &target, NULL, err)) { g_string_free(name, TRUE); name = NULL; } + g_string_free(uuid, TRUE); dm_udev_wait(cookie); out: @@ -2826,12 +2874,14 @@ _dm_create_mirrored(const LDMVolumePrivate * const vol, GError ** const err) } name = _dm_vol_name(vol); + GString *uuid = _dm_vol_uuid(vol); - if (!_dm_create(name->str, cookie, 1, &target, NULL, err)) { + if (!_dm_create(name->str, uuid->str, cookie, 1, &target, NULL, err)) { g_string_free(name, TRUE); name = NULL; } + g_string_free(uuid, TRUE); dm_udev_wait(cookie); g_array_unref(devices); devices = NULL; @@ -2857,6 +2907,7 @@ static GString * _dm_create_raid5(const LDMVolumePrivate * const vol, GError ** const err) { GString *name = NULL; + GString *uuid = NULL; struct dm_target target; target.start = 0; @@ -2914,12 +2965,15 @@ _dm_create_raid5(const LDMVolumePrivate * const vol, GError ** const err) } name = _dm_vol_name(vol); + uuid = _dm_vol_uuid(vol); - if (!_dm_create(name->str, cookie, 1, &target, NULL, err)) { + if (!_dm_create(name->str, uuid->str, cookie, 1, &target, NULL, err)) { g_string_free(name, TRUE); name = NULL; + g_string_free(uuid, TRUE); goto out; } + g_string_free(uuid, TRUE); dm_udev_wait(cookie); g_array_unref(devices); devices = NULL; @@ -2938,6 +2992,7 @@ out: } g_string_free(target.params, TRUE); + return name; } -- 2.17.0

libdevmapper provides dm_tree_find_node_by_uuid function which we can use to find device in a tree and get rid of our own implementation. --- src/ldm.c | 52 ++++++++++++---------------------------------------- 1 file changed, 12 insertions(+), 40 deletions(-) diff --git a/src/ldm.c b/src/ldm.c index 65606cc..1be6736 100644 --- a/src/ldm.c +++ b/src/ldm.c @@ -2501,38 +2501,6 @@ error: return NULL; } -static struct dm_tree_node * -_walk_tree(const struct dm_tree * const tree, - const struct dm_tree_node * const node, - const char * const search) -{ - void *handle = NULL; - struct dm_tree_node *child; - for (;;) { - child = dm_tree_next_child(&handle, node, 0); - if (!child) return NULL; - - const char * const name = dm_tree_node_get_name(child); - if (!name || *name == '\0') continue; - - if (g_strcmp0(search, name) == 0) return child; - - if (dm_tree_node_num_children(child, 0) > 0) { - struct dm_tree_node * const r_search = - _walk_tree(tree, child, search); - if (r_search) return r_search; - } - } -} - -static struct dm_tree_node * -_find_device_tree_node(struct dm_tree * const tree, - const char * const name) -{ - const struct dm_tree_node * const root = dm_tree_find_node(tree, 0, 0); - return _walk_tree(tree, root, name); -} - gboolean _dm_create(const gchar * const name, const gchar * const uuid, uint32_t udev_cookie, const guint n_targets, @@ -2900,6 +2868,7 @@ out: } g_string_free(target.params, TRUE); + return name; } @@ -3045,15 +3014,17 @@ ldm_volume_dm_create(const LDMVolume * const o, GString **created, struct dm_tree *tree = _get_device_tree(err); if (!tree) return FALSE; - GString *name = _dm_vol_name(vol); - struct dm_tree_node *node = _find_device_tree_node(tree, name->str); + GString *uuid = _dm_vol_uuid(vol); + struct dm_tree_node *node = dm_tree_find_node_by_uuid(tree, uuid->str); + g_string_free(uuid, TRUE); + if (node) { dm_tree_free(tree); tree = NULL; return TRUE; } dm_tree_free(tree); tree = NULL; - g_string_free(name, TRUE); name = NULL; + GString *name = NULL; switch (vol->type) { case LDM_VOLUME_TYPE_SIMPLE: case LDM_VOLUME_TYPE_SPANNED: @@ -3106,17 +3077,20 @@ ldm_volume_dm_remove(const LDMVolume * const o, GString **removed, gboolean r = FALSE; - GString *name = _dm_vol_name(vol); - struct dm_tree_node *node = _find_device_tree_node(tree, name->str); + GString *uuid = _dm_vol_uuid(vol); + struct dm_tree_node *node = dm_tree_find_node_by_uuid(tree, uuid->str); + g_string_free(uuid, TRUE); + + GString *name = NULL; if (node) { uint32_t cookie; if (!dm_udev_create_cookie(&cookie)) { g_set_error(err, LDM_ERROR, LDM_ERROR_EXTERNAL, "dm_udev_create_cookie: %s", _dm_err_last_msg); - g_string_free(name, TRUE); name = NULL; goto out; } + name = _dm_vol_name(vol); if (!_dm_remove(name->str, cookie, err)) { g_string_free(name, TRUE); name = NULL; goto out; @@ -3131,8 +3105,6 @@ ldm_volume_dm_remove(const LDMVolume * const o, GString **removed, } dm_udev_wait(cookie); - } else { - g_string_free(name, TRUE); name = NULL; } r = TRUE; -- 2.17.0

Get path to a device mapper directory calling "dm_dir" function from devmapper library instead of using hard-coded value "/dev/mapper". --- src/ldm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ldm.c b/src/ldm.c index ac6bae8..f31a0aa 100644 --- a/src/ldm.c +++ b/src/ldm.c @@ -2840,6 +2840,8 @@ _dm_create_mirrored(const LDMVolumePrivate * const vol, GError ** const err) goto out; } + const char *dir = dm_dir(); + int found = 0; for (guint i = 0; i < vol->parts->len; i++) { const LDMPartition * const part_o = @@ -2860,7 +2862,7 @@ _dm_create_mirrored(const LDMVolumePrivate * const vol, GError ** const err) found++; g_array_append_val(devices, chunk); - g_string_append_printf(target.params, " - /dev/mapper/%s", chunk->str); + g_string_append_printf(target.params, " - %s/%s", dir, chunk->str); } if (found == 0) { @@ -2932,6 +2934,8 @@ _dm_create_raid5(const LDMVolumePrivate * const vol, GError ** const err) goto out; } + const char *dir = dm_dir(); + guint n_found = 0; for (guint i = 0; i < vol->parts->len; i++) { const LDMPartition * const part_o = @@ -2952,7 +2956,7 @@ _dm_create_raid5(const LDMVolumePrivate * const vol, GError ** const err) n_found++; g_array_append_val(devices, chunk); - g_string_append_printf(target.params, " - /dev/mapper/%s", chunk->str); + g_string_append_printf(target.params, " - %s/%s", dir, chunk->str); } if (n_found < vol->parts->len - 1) { -- 2.17.0

Don't make unnecessary function calls in show_<object> functions family until we find requested object (volume, partition etc.). Also make sure the functions return correct result. --- src/ldmtool.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src/ldmtool.c b/src/ldmtool.c index 9686778..6ae5c0b 100644 --- a/src/ldmtool.c +++ b/src/ldmtool.c @@ -279,15 +279,15 @@ show_volume(LDM *const ldm, const gint argc, gchar ** const argv, LDMVolume * const vol = g_array_index(volumes, LDMVolume *, i); gchar *name = ldm_volume_get_name(vol); - gchar* guid = ldm_volume_get_guid(vol); - LDMVolumeType type = ldm_volume_get_voltype(vol); - guint64 size = ldm_volume_get_size(vol); - guint64 chunk_size = ldm_volume_get_chunk_size(vol); - gchar *hint = ldm_volume_get_hint(vol); - if (g_strcmp0(name, argv[1]) == 0) { found = TRUE; + gchar* guid = ldm_volume_get_guid(vol); + LDMVolumeType type = ldm_volume_get_voltype(vol); + guint64 size = ldm_volume_get_size(vol); + guint64 chunk_size = ldm_volume_get_chunk_size(vol); + gchar *hint = ldm_volume_get_hint(vol); + json_builder_begin_object(jb); GEnumValue * const type_v = @@ -323,11 +323,12 @@ show_volume(LDM *const ldm, const gint argc, gchar ** const argv, json_builder_end_array(jb); json_builder_end_object(jb); + + g_free(guid); + g_free(hint); } g_free(name); - g_free(guid); - g_free(hint); if (found) break; } @@ -347,17 +348,17 @@ show_partition(LDM *const ldm, const gint argc, gchar ** const argv, GArray * const parts = ldm_disk_group_get_partitions(dg); g_object_unref(dg); + gboolean found = FALSE; for (guint i = 0; i < parts->len; i++) { LDMPartition * const part = g_array_index(parts, LDMPartition *, i); gchar *name = ldm_partition_get_name(part); - guint64 start = ldm_partition_get_start(part); - guint64 size = ldm_partition_get_size(part); - - gboolean found = FALSE; if (g_strcmp0(name, argv[1]) == 0) { found = TRUE; + guint64 start = ldm_partition_get_start(part); + guint64 size = ldm_partition_get_size(part); + LDMDisk * const disk = ldm_partition_get_disk(part); gchar *diskname = ldm_disk_get_name(disk); g_object_unref(disk); @@ -384,7 +385,7 @@ show_partition(LDM *const ldm, const gint argc, gchar ** const argv, } g_array_unref(parts); - return TRUE; + return found; } gboolean @@ -403,16 +404,16 @@ show_disk(LDM *const ldm, const gint argc, gchar ** const argv, LDMDisk * const disk = g_array_index(disks, LDMDisk *, i); gchar *name = ldm_disk_get_name(disk); - gchar *guid = ldm_disk_get_guid(disk); - gchar *device = ldm_disk_get_device(disk); - guint64 data_start = ldm_disk_get_data_start(disk); - guint64 data_size = ldm_disk_get_data_size(disk); - guint64 metadata_start = ldm_disk_get_metadata_start(disk); - guint64 metadata_size = ldm_disk_get_metadata_size(disk); - if (g_strcmp0(name, argv[1]) == 0) { found = TRUE; + gchar *guid = ldm_disk_get_guid(disk); + gchar *device = ldm_disk_get_device(disk); + guint64 data_start = ldm_disk_get_data_start(disk); + guint64 data_size = ldm_disk_get_data_size(disk); + guint64 metadata_start = ldm_disk_get_metadata_start(disk); + guint64 metadata_size = ldm_disk_get_metadata_size(disk); + json_builder_begin_object(jb); json_builder_set_member_name(jb, "name"); @@ -435,17 +436,18 @@ show_disk(LDM *const ldm, const gint argc, gchar ** const argv, } json_builder_end_object(jb); + + g_free(guid); + g_free(device); } g_free(name); - g_free(guid); - g_free(device); if (found) break; } g_array_unref(disks); - return TRUE; + return found; } gboolean -- 2.17.0

New API method is introduced - ldm_partition_dm_get_device(...) which returns device mapper device after it have been created or NULL otherwise. ldmtool "show partition" command displays "device" field if corresponding device mapper device have been created for the specified partition. Field is omitted otherwise. e.g. /dev/mapper/ldm_part_Red-nzv8x6obywgDg0_Disk6-01 --- src/ldm.c | 114 ++++++++++++++++++++++++++++--------------------- src/ldm.h | 14 ++++++ src/ldmtool.c | 13 ++++++ test/ldmread.c | 30 +++++++------ 4 files changed, 111 insertions(+), 60 deletions(-) diff --git a/src/ldm.c b/src/ldm.c index 75f6d5b..20ec1b0 100644 --- a/src/ldm.c +++ b/src/ldm.c @@ -2569,6 +2569,60 @@ _dm_find_tree_node_by_uuid(const gchar * const uuid, return r; } +gchar * +_dm_get_device(const gchar * const uuid, GError ** const err) +{ + GString *r = NULL; + + struct dm_tree_node *node = NULL; + struct dm_tree *tree = NULL; + struct dm_task *task = NULL; + + if (_dm_find_tree_node_by_uuid(uuid, &node, &tree, err)) { + const struct dm_info *info = dm_tree_node_get_info(node); + + task = dm_task_create(DM_DEVICE_INFO); + if (!task) { + g_set_error(err, LDM_ERROR, LDM_ERROR_EXTERNAL, + "dm_task_create: %s", _dm_err_last_msg); + goto error; + } + + if (!dm_task_set_major(task, info->major)) { + g_set_error(err, LDM_ERROR, LDM_ERROR_EXTERNAL, + "DM_DEVICE_INFO: dm_task_set_major(%d) failed: %s", + info->major, _dm_err_last_msg); + goto error; + } + + if (!dm_task_set_minor(task, info->minor)) { + g_set_error(err, LDM_ERROR, LDM_ERROR_EXTERNAL, + "DM_DEVICE_INFO: dm_task_set_major(%d) failed: %s", + info->minor, _dm_err_last_msg); + goto error; + } + + if (!dm_task_run(task)) { + g_set_error_literal(err, LDM_ERROR, LDM_ERROR_EXTERNAL, + _dm_err_last_msg); + goto error; + } + + const char *dir = dm_dir(); + char *mangled_name = dm_task_get_name_mangled(task); + r = g_string_new(""); + g_string_printf(r, "%s/%s", dir, mangled_name); + dm_free(mangled_name); + } + +error: + if (tree) dm_tree_free(tree); + if (task) dm_task_destroy(task); + + /* Really FALSE here - don't free but return the character data. */ + return r ? g_string_free(r, FALSE) : NULL; +} + gboolean _dm_create(const gchar * const name, const gchar * const uuid, uint32_t udev_cookie, const guint n_targets, @@ -3044,59 +3098,23 @@ ldm_volume_dm_get_name(const LDMVolume * const o) } gchar * -ldm_volume_dm_get_device(const LDMVolume * const o, GError ** const err) +ldm_partition_dm_get_device(const LDMPartition * const o, GError ** const err) { - GString *r = NULL; - - GString *uuid = _dm_vol_uuid(o->priv); - struct dm_tree_node *node = NULL; - struct dm_tree *tree = NULL; - struct dm_task *task = NULL; - - if (_dm_find_tree_node_by_uuid(uuid->str, &node, &tree, err)) { - const struct dm_info *info = dm_tree_node_get_info(node); - - task = dm_task_create(DM_DEVICE_INFO); - if (!task) { - g_set_error(err, LDM_ERROR, LDM_ERROR_EXTERNAL, - "dm_task_create: %s", _dm_err_last_msg); - goto error; - } - - if (!dm_task_set_major(task, info->major)) { - g_set_error(err, LDM_ERROR, LDM_ERROR_EXTERNAL, - "DM_DEVICE_INFO: dm_task_set_major(%d) failed: %s", - info->major, _dm_err_last_msg); - goto error; - } - - if (!dm_task_set_minor(task, info->minor)) { - g_set_error(err, LDM_ERROR, LDM_ERROR_EXTERNAL, - "DM_DEVICE_INFO: dm_task_set_major(%d) failed: %s", - info->minor, _dm_err_last_msg); - goto error; - } - - if (!dm_task_run(task)) { - g_set_error_literal(err, LDM_ERROR, LDM_ERROR_EXTERNAL, - _dm_err_last_msg); - goto error; - } + GString *uuid = _dm_part_uuid(o->priv); + gchar* r = _dm_get_device(uuid->str, err); + g_string_free(uuid, TRUE); - const char *dir = dm_dir(); - char *mangled_name = dm_task_get_name_mangled(task); - r = g_string_new(""); - g_string_printf(r, "%s/%s", dir, mangled_name); - dm_free(mangled_name); - } + return r; +} -error: - if (tree) dm_tree_free(tree); - if (task) dm_task_destroy(task); +gchar * +ldm_volume_dm_get_device(const LDMVolume * const o, GError ** const err) +{ + GString *uuid = _dm_vol_uuid(o->priv); + gchar* r = _dm_get_device(uuid->str, err); g_string_free(uuid, TRUE); - /* Really FALSE here - don't free but return the character data. */ - return r ? g_string_free(r, FALSE) : NULL; + return r; } gboolean diff --git a/src/ldm.h b/src/ldm.h index de1552a..fd615b4 100644 --- a/src/ldm.h +++ b/src/ldm.h @@ -538,6 +538,20 @@ guint64 ldm_partition_get_start(const LDMPartition *o); */ guint64 ldm_partition_get_size(const LDMPartition *o); +/** + * ldm_partition_dm_get_device: + * @o: An #LDMPartition + * @err: A #GError to receive any generated errors + * + * Get the host device mapper device which was created for this partition + * (e.g. /dev/mapper/ldm_part_Red-nzv8x6obywgDg0_Disk1-01). It is dynamic + * runtime property and it will be NULL if device mapper device is absent. + * + * Returns: (transfer full): The host device mapper device if present, + * or NULL otherwise + */ +gchar *ldm_partition_dm_get_device(const LDMPartition * const o, GError **err); + /** * ldm_disk_get_name * @o: An #LDMDisk diff --git a/src/ldmtool.c b/src/ldmtool.c index bc58601..6957c1a 100644 --- a/src/ldmtool.c +++ b/src/ldmtool.c @@ -376,6 +376,14 @@ show_partition(LDM *const ldm, const gint argc, gchar ** const argv, gchar *diskname = ldm_disk_get_name(disk); g_object_unref(disk); + GError *err = NULL; + gchar *device = ldm_partition_dm_get_device(part, &err); + if (err) { + g_warning("Unable to get device for partition %s on disk %s: %s", + name, diskname, err->message); + g_error_free(err); + } + json_builder_begin_object(jb); json_builder_set_member_name(jb, "name"); @@ -386,10 +394,15 @@ show_partition(LDM *const ldm, const gint argc, gchar ** const argv, json_builder_add_int_value(jb, size); json_builder_set_member_name(jb, "disk"); json_builder_add_string_value(jb, diskname); + if (device != NULL) { + json_builder_set_member_name(jb, "device"); + json_builder_add_string_value(jb, device); + } json_builder_end_object(jb); g_free(diskname); + g_free(device); } g_free(name); diff --git a/test/ldmread.c b/test/ldmread.c index fd40670..a01ac67 100644 --- a/test/ldmread.c +++ b/test/ldmread.c @@ -61,7 +61,7 @@ int main(int argc, const char *argv[]) g_object_get(dg, "guid", &guid, "name", &name, NULL); printf("Disk Group: %s\n", name); - printf(" GUID: %s\n", guid); + printf(" GUID: %s\n", guid); g_free(guid); g_free(name); @@ -93,13 +93,13 @@ int main(int argc, const char *argv[]) gchar *device = ldm_volume_dm_get_device(vol, &err); printf(" Volume: %s\n", name); - printf(" GUID: %s\n", guid); + printf(" GUID: %s\n", guid); printf(" Type: %s\n", type_v->value_nick); printf(" Size: %lu\n", size); printf(" Part Type: %hhu\n", part_type); printf(" Hint: %s\n", hint); printf(" Chunk Size: %lu\n", chunk_size); - printf(" Device: %s\n", device); + printf(" Device: %s\n", device); g_free(name); g_free(guid); @@ -121,11 +121,17 @@ int main(int argc, const char *argv[]) g_object_get(part, "name", &name, "start", &start, "size", &size, NULL); + GError *err = NULL; + gchar *device = ldm_partition_dm_get_device(part, &err); + printf(" Partition: %s\n", name); - printf(" Start: %lu\n", start); - printf(" Size: %lu\n", size); + printf(" Start: %lu\n", start); + printf(" Size: %lu\n", size); + printf(" Device: %s\n", device); g_free(name); + g_free(device); + if (err) g_error_free(err); } LDMDisk * const disk = ldm_partition_get_disk(part); @@ -147,13 +153,13 @@ int main(int argc, const char *argv[]) "metadata-size", &metadata_size, NULL); - printf(" Disk: %s\n", name); - printf(" GUID: %s\n", guid); - printf(" Device: %s\n", device); - printf(" Data Start: %lu\n", data_start); - printf(" Data Size: %lu\n", data_size); - printf(" Metadata Start: %lu\n", metadata_start); - printf(" Metadata Size: %lu\n", metadata_size); + printf(" Disk: %s\n", name); + printf(" GUID: %s\n", guid); + printf(" Device: %s\n", device); + printf(" Data Start: %lu\n", data_start); + printf(" Data Size: %lu\n", data_size); + printf(" Metadata Start: %lu\n", metadata_start); + printf(" Metadata Size: %lu\n", metadata_size); g_free(name); g_free(guid); -- 2.17.0