mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-22 17:35:59 +03:00
Add 'mangled_name' and 'unmangled_name' fields to dmsetup info -c -o.
This commit is contained in:
parent
5a923ff8ad
commit
f2e7993792
@ -1,5 +1,6 @@
|
||||
Version 1.02.71 -
|
||||
====================================
|
||||
Add 'mangled_name' and 'unmangled_name' fields to dmsetup info -c -o.
|
||||
Add --manglename option to dmsetup to select the name mangling mode.
|
||||
Add dm_task_get_name_mangled/unmangled to libdevmapper.
|
||||
Mangle device name on dm_task_set_name/newname call if necessary.
|
||||
|
@ -2262,6 +2262,38 @@ static int _dm_name_disp(struct dm_report *rh,
|
||||
return dm_report_field_string(rh, field, &name);
|
||||
}
|
||||
|
||||
static int _dm_mangled_name_disp(struct dm_report *rh,
|
||||
struct dm_pool *mem __attribute__((unused)),
|
||||
struct dm_report_field *field, const void *data,
|
||||
void *private __attribute__((unused)))
|
||||
{
|
||||
char *name;
|
||||
int r = 0;
|
||||
|
||||
if ((name = dm_task_get_name_mangled((const struct dm_task *) data))) {
|
||||
r = dm_report_field_string(rh, field, (const char **) &name);
|
||||
dm_free(name);
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
static int _dm_unmangled_name_disp(struct dm_report *rh,
|
||||
struct dm_pool *mem __attribute__((unused)),
|
||||
struct dm_report_field *field, const void *data,
|
||||
void *private __attribute__((unused)))
|
||||
{
|
||||
char *name;
|
||||
int r = 0;
|
||||
|
||||
if ((name = dm_task_get_name_unmangled((const struct dm_task *) data))) {
|
||||
r = dm_report_field_string(rh, field, (const char **) &name);
|
||||
dm_free(name);
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
static int _dm_uuid_disp(struct dm_report *rh,
|
||||
struct dm_pool *mem __attribute__((unused)),
|
||||
struct dm_report_field *field,
|
||||
@ -2693,6 +2725,8 @@ static const struct dm_report_object_type _report_types[] = {
|
||||
static const struct dm_report_field_type _report_fields[] = {
|
||||
/* *INDENT-OFF* */
|
||||
FIELD_F(TASK, STR, "Name", 16, dm_name, "name", "Name of mapped device.")
|
||||
FIELD_F(TASK, STR, "MangledName", 16, dm_mangled_name, "mangled_name", "Mangled name of mapped device.")
|
||||
FIELD_F(TASK, STR, "UnmangledName", 16, dm_unmangled_name, "unmangled_name", "Unmangled name of mapped device.")
|
||||
FIELD_F(TASK, STR, "UUID", 32, dm_uuid, "uuid", "Unique (optional) identifier for mapped device.")
|
||||
|
||||
/* FIXME Next one should be INFO */
|
||||
|
Loading…
Reference in New Issue
Block a user