shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

Add mangle command to dmsetup to provide renaming to correct mangled form.

Browse Source
This commit is contained in:
Peter Rajnoha 2012-02-15 12:08:57 +00:00
parent f2e7993792
commit 7f024cf822
2 changed files with 79 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.71 -
====================================
Add mangle command to dmsetup to provide renaming to correct mangled form.
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.

84
tools/dmsetup.c
View File

@ -699,8 +699,7 @@ static int _create(CMD_ARGS)
return r;
}
static int _rename(CMD_ARGS)
{
static int _do_rename(const char *name, const char *new_name, const char *new_uuid) {
int r = 0;
struct dm_task *dmt;
uint32_t cookie = 0;
@ -710,13 +709,13 @@ static int _rename(CMD_ARGS)
return 0;
/* FIXME Kernel doesn't support uuid or device number here yet */
if (!_set_task_device(dmt, (argc == 3) ? argv[1] : NULL, 0))
if (!_set_task_device(dmt, name, 0))
goto out;
if (_switches[SETUUID_ARG]) {
if (!dm_task_set_newuuid(dmt, argv[argc - 1]))
if (new_uuid) {
if (!dm_task_set_newuuid(dmt, new_uuid))
goto out;
} else if (!dm_task_set_newname(dmt, argv[argc - 1]))
} else if (!dm_task_set_newname(dmt, new_name))
goto out;
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
@ -753,6 +752,15 @@ static int _rename(CMD_ARGS)
return r;
}
static int _rename(CMD_ARGS)
{
const char *name = (argc == 3) ? argv[1] : NULL;
return _switches[SETUUID_ARG] ? _do_rename(name, NULL, argv[argc - 1]) :
_do_rename(name, argv[argc - 1], NULL);
}
static int _message(CMD_ARGS)
{
int r = 0, i;
@ -2895,6 +2903,66 @@ static int _ls(CMD_ARGS)
return _process_all(cmd, argc, argv, 0, _display_name);
}
static int _mangle(CMD_ARGS)
{
char *name;
char *new_name = NULL;
struct dm_task *dmt;
struct dm_info info;
int r = 0;
int target_format;
if (names)
name = names->name;
else {
if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG])
return _process_all(cmd, argc, argv, 0, _mangle);
name = argv[1];
}
if (!(dmt = dm_task_create(DM_DEVICE_STATUS)))
return 0;
if (!(_set_task_device(dmt, name, 0)))
goto out;
if (!_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt))
goto out;
if (!dm_task_run(dmt))
goto out;
if (!dm_task_get_info(dmt, &info) || !info.exists)
goto out;
target_format = _switches[MANGLENAME_ARG] ? _int_args[MANGLENAME_ARG]
: DEFAULT_DM_NAME_MANGLING;
if (target_format == DM_STRING_MANGLING_NONE) {
if (!(new_name = dm_task_get_name_unmangled(dmt)))
goto out;
}
else if (!(new_name = dm_task_get_name_mangled(dmt)))
goto out;
/* Nothing to do if the name is in correct form already. */
if (!strcmp(name, new_name)) {
log_print("%s: name already in correct form", name);
r = 1;
goto out;
}
else
log_print("%s: renaming to %s", name, new_name);
/* Rename to correct form of the name. */
r = _do_rename(name, new_name, NULL);
out:
dm_free(new_name);
dm_task_destroy(dmt);
return r;
}
static int _help(CMD_ARGS);
/*
@ -2924,6 +2992,7 @@ static struct command _commands[] = {
{"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, _status},
{"wait", "<device> [<event_nr>]", 0, 2, 0, _wait},
{"mknodes", "[<device>]", 0, -1, 1, _mknodes},
{"mangle", "[<device>]", 0, -1, 1, _mangle},
{"udevcreatecookie", "", 0, 0, 0, _udevcreatecookie},
{"udevreleasecookie", "[<cookie>]", 0, 1, 0, _udevreleasecookie},
{"udevflags", "<cookie>", 1, 1, 0, _udevflags},
@ -3677,6 +3746,9 @@ int main(int argc, char **argv)
if (!_switches[COLS_ARG] && !strcmp(cmd->name, "splitname"))
_switches[COLS_ARG]++;
if (!strcmp(cmd->name, "mangle"))
dm_set_name_mangling_mode(DM_STRING_MANGLING_NONE);
if (_switches[COLS_ARG]) {
if (!_report_init(cmd))
goto out;