shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Avoid generating duplicate lv names

Browse Source
This commit is contained in:
Alasdair Kergon 2001-11-14 14:12:01 +00:00
parent 5238b63f1a
commit 6e74833c6c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/metadata/lv_manip.c
View File

@ -174,12 +174,12 @@ static int _allocate(struct volume_group *vg, struct logical_volume *lv,
return r; return r;
} }
static char *_make_up_lv_name(struct volume_group *vg, static char *_generate_lv_name(struct volume_group *vg,
char *buffer, size_t len) char *buffer, size_t len)
{ {
struct list *lvh; struct list *lvh;
struct logical_volume *lv; struct logical_volume *lv;
int high = 1, i, s; int high = -1, i, s;
list_iterate(lvh, &vg->lvs) { list_iterate(lvh, &vg->lvs) {
lv = &(list_item(lvh, struct lv_list)->lv); lv = &(list_item(lvh, struct lv_list)->lv);
@ -188,10 +188,10 @@ static char *_make_up_lv_name(struct volume_group *vg,
continue; continue;
if (i > high) if (i > high)
high = i + 1; high = i;
} }
if ((s = snprintf(buffer, len, "lvol%d", high)) < 0 || s >= len) if ((s = snprintf(buffer, len, "lvol%d", high + 1)) < 0 || s >= len)
return NULL; return NULL;
return buffer; return buffer;
@ -230,7 +230,7 @@ struct logical_volume *lv_create(const char *name,
} }
if (!name && if (!name &&
!(name = _make_up_lv_name(vg, dname, sizeof(dname)))) { !(name = _generate_lv_name(vg, dname, sizeof(dname)))) {
log_error("Failed to generate unique name for the new " log_error("Failed to generate unique name for the new "
"logical volume"); "logical volume");
return NULL; return NULL;

4
tools/lvcreate.c
View File

@ -233,6 +233,8 @@ int lvcreate(int argc, char **argv)
if (!fid->ops->vg_write(fid, vg)) if (!fid->ops->vg_write(fid, vg))
return ECMD_FAILED; return ECMD_FAILED;
log_print("Logical volume %s created", lv->name);
if (!lv_activate(lv)) if (!lv_activate(lv))
return ECMD_FAILED; return ECMD_FAILED;
@ -263,7 +265,5 @@ int lvcreate(int argc, char **argv)
return ret; return ret;
***********/ ***********/
log_print("Logical volume %s created", lv->name);
return 0; return 0;
} }