From 6c3dc203886f908a737377648ae65ebd96b27874 Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Mon, 12 Nov 2007 20:02:55 +0000 Subject: [PATCH] Fix compile warnings / minor errors introduced recently. --- tools/lvcreate.c | 4 ++-- tools/lvresize.c | 2 +- tools/toollib.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 3257a5aba..60b871650 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -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; diff --git a/tools/lvresize.c b/tools/lvresize.c index 0bd892e8f..c70f28c55 100644 --- a/tools/lvresize.c +++ b/tools/lvresize.c @@ -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, '/'))) diff --git a/tools/toollib.c b/tools/toollib.c index 0220eb568..a5b686eff 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -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; -- 2.43.5