1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-30 10:50:34 +03:00

Fix compile warnings / minor errors introduced recently.

This commit is contained in:
Dave Wysochanski 2007-11-12 20:02:55 +00:00
parent 46355000d1
commit 6c3dc20388
3 changed files with 4 additions and 4 deletions

View File

@ -638,7 +638,7 @@ static int _lvcreate(struct cmd_context *cmd, struct lvcreate_params *lp)
lp->extents = lp->extents - size_rest + lp->stripes;
}
if (lp->zero && !activation) {
if (lp->zero && !activation()) {
log_error("Can't wipe start of new LV without using "
"device-mapper kernel driver");
return 0;
@ -918,7 +918,7 @@ deactivate_and_revert_new_lv:
revert_new_lv:
/* FIXME Better to revert to backup of metadata? */
if (!lv_remove(lv) || !vg_write(vg) || backup(vg), !vg_commit(vg))
if (!lv_remove(lv) || !vg_write(vg) || backup(vg) || !vg_commit(vg))
log_error("Manual intervention may be required to remove "
"abandoned LV(s) before retrying.");
return 0;

View File

@ -243,7 +243,7 @@ static int _lvresize_params(struct cmd_context *cmd, int argc, char **argv,
if (!validate_name(lp->vg_name)) {
log_error("Volume group name %s has invalid characters",
lp->vg_name);
return NULL;
return 0;
}
if ((st = strrchr(lp->lv_name, '/')))

View File

@ -1415,7 +1415,7 @@ deactivate_and_revert_new_lv:
}
revert_new_lv:
if (!lv_remove(log_lv) || !vg_write(vg) || backup(vg), !vg_commit(vg))
if (!lv_remove(log_lv) || !vg_write(vg) || backup(vg) || !vg_commit(vg))
log_error("Manual intervention may be required to remove "
"abandoned log LV before retrying.");
return NULL;