shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Some simple fixups for last checkin:

Browse Source 
* remove "_" from "return_0"
* improve some naming and terminology
* add 'const'
This commit is contained in:
Dave Wysochanski 2007-08-07 16:57:09 +00:00
parent 08c9ff434b
commit 4f4d5fdc67
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/metadata/lv_manip.c
View File

@ -1472,12 +1472,12 @@ static int _rename_single_lv(struct logical_volume *lv, char *new_name)
if (find_lv_in_vg(vg, new_name)) {
log_error("Logical volume \"%s\" already exists in "
"volume group \"%s\"", new_name, vg->name);
return_0;
return 0;
}
if (lv->status & LOCKED) {
log_error("Cannot rename locked LV %s", lv->name);
return_0;
return 0;
}
lv->name = new_name;
@ -1489,7 +1489,7 @@ static int _rename_single_lv(struct logical_volume *lv, char *new_name)
* Returns a pointer to LV name suffix.
* Returns NULL if the LV doesn't have suffix.
*/
static char * sub_lv_name_suffix(const char *lvname)
static char *_sub_lv_name_suffix(const char *lvname)
{
char *s;
@ -1504,24 +1504,23 @@ static char * sub_lv_name_suffix(const char *lvname)
/*
* Rename sub LV.
* Returns 0 on failure, 1 on success.
* If a new name for the sub LV cannot be determined, 1 is returned.
* 'lv_main_old' and 'lv_main_new' are old and new names of the main LV.
* 'lv_name_old' and 'lv_name_new' are old and new names of the main LV.
*/
static int _rename_sub_lv(struct cmd_context *cmd,
struct logical_volume *lv,
char *lv_main_old, char *lv_main_new)
const char *lv_name_old, const char *lv_name_new)
{
char *suffix, *new_name;
size_t l;
size_t len;
/* Rename only if the lv has known suffix */
if (!(suffix = sub_lv_name_suffix(lv->name)))
if (!(suffix = _sub_lv_name_suffix(lv->name)))
return 1;
/* Make sure that lv->name is exactly a lv_main_old + suffix */
l = suffix - lv->name;
if (strlen(lv_main_old) != l || strncmp(lv->name, lv_main_old, l))
/* Make sure that lv->name is exactly a lv_name_old + suffix */
len = suffix - lv->name;
if (strlen(lv_name_old) != len || strncmp(lv->name, lv_name_old, len))
return 1;
/*
@ -1530,15 +1529,15 @@ static int _rename_sub_lv(struct cmd_context *cmd,
* if the sub LV is "lvol0_mlog" and
* a new name for main LV is "lvol1"
*/
l = strlen(lv_main_new) + strlen(suffix) + 1;
new_name = dm_pool_alloc(cmd->mem, l);
len = strlen(lv_name_new) + strlen(suffix) + 1;
new_name = dm_pool_alloc(cmd->mem, len);
if (!new_name) {
log_error("Failed to allocate space for new name");
return_0;
return 0;
}
if (!dm_snprintf(new_name, l, "%s%s", lv_main_new, suffix)) {
if (!dm_snprintf(new_name, len, "%s%s", lv_name_new, suffix)) {
log_error("Failed to create new name");
return_0;
return 0;
}
/* Rename it */
@ -1569,11 +1568,11 @@ static int _for_each_sub_lv(struct cmd_context *cmd, struct logical_volume *lv,
list_iterate_items(seg, &lv->segments) {
if (seg->log_lv && !func(cmd, seg->log_lv, data))
return_0;
return 0;
for (s = 0; s < seg->area_count; s++)
if (seg_type(seg, s) == AREA_LV &&
!func(cmd, seg_lv(seg, s), data))
return_0;
return 0;
}
return 1;
@ -1593,7 +1592,7 @@ int lv_rename(struct cmd_context *cmd, struct logical_volume *lv,
/* rename is not allowed on sub LVs */
if ((lv->status & MIRROR_LOG) || (lv->status & MIRROR_IMAGE)) {
log_error("Cannot rename hidden LV \"%s\".", lv->name);
log_error("Cannot rename internal LV \"%s\".", lv->name);
return 0;
}
@ -1609,7 +1608,7 @@ int lv_rename(struct cmd_context *cmd, struct logical_volume *lv,
}
if (!archive(vg))
return_0;
return 0;
/* rename sub LVs */
names[0] = lv->name;
@ -1625,7 +1624,7 @@ int lv_rename(struct cmd_context *cmd, struct logical_volume *lv,
log_verbose("Writing out updated volume group");
if (!vg_write(vg))
return_0;
return 0;
backup(vg);