From ffb316211684c3dc235ba0bf3cf1a1a2adeb9185 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Mon, 15 Oct 2001 22:04:27 +0000
Subject: [PATCH] vgextend

---
 lib/metadata/metadata.c | 25 ++++++++----
 lib/metadata/metadata.h |  2 +
 tools/Makefile.in       |  1 +
 tools/stub.h            |  1 -
 tools/vgextend.c        | 86 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 107 insertions(+), 8 deletions(-)
 create mode 100644 tools/vgextend.c

diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 7f636c9f1..95d28041c 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -97,11 +97,26 @@ int _add_pv_to_vg(struct io_space *ios, struct volume_group *vg,
 	return 1;
 }
 
+int vg_extend(struct io_space *ios, struct volume_group *vg, int pv_count,
+	   char **pv_names)
+{
+	int i;
+
+	/* attach each pv */
+	for (i = 0; i < pv_count; i++)
+		if (!_add_pv_to_vg(ios, vg, pv_names[i])) {
+			log_error("Unable to add physical volume '%s' to "
+				  "volume group '%s'.", pv_names[i], vg->name);
+			return 0;
+		}
+
+	return 1;
+}
+
 struct volume_group *vg_create(struct io_space *ios, const char *vg_name,
 			       uint64_t extent_size, int max_pv, int max_lv,
 			       int pv_count, char **pv_names)
 {
-	int i;
 	struct volume_group *vg;
 
 	if (!(vg = pool_alloc(ios->mem, sizeof (*vg)))) {
@@ -151,12 +166,8 @@ struct volume_group *vg_create(struct io_space *ios, const char *vg_name,
 	}
 
 	/* attach the pv's */
-	for (i = 0; i < pv_count; i++)
-		if (!_add_pv_to_vg(ios, vg, pv_names[i])) {
-			log_error("Unable to add physical volume '%s' to "
-				  "volume group '%s'.", pv_names[i], vg_name);
-			goto bad;
-		}
+	if (!vg_extend(ios, vg, pv_count, pv_names))
+		goto bad;
 
 	return vg;
 
diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h
index dcc015a20..7900191dc 100644
--- a/lib/metadata/metadata.h
+++ b/lib/metadata/metadata.h
@@ -206,6 +206,8 @@ struct physical_volume *pv_create(struct io_space *ios, const char *name);
 
 
 
+int vg_extend(struct io_space *ios, struct volume_group *vg, int pv_count,
+              char **pv_names);
 
 
 
diff --git a/tools/Makefile.in b/tools/Makefile.in
index db77c3b57..5c879b3e0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -27,6 +27,7 @@ SOURCES=\
 	toollib.c \
 	vgck.c \
 	vgcreate.c \
+	vgextend.c \
 	vgreduce.c \
 	vgrename.c \
 	vgremove.c \
diff --git a/tools/stub.h b/tools/stub.h
index 15e8ae780..11911f398 100644
--- a/tools/stub.h
+++ b/tools/stub.h
@@ -39,7 +39,6 @@ int vgchange(int argc, char **argv) {return 1;}
 int vgcfgrestore(int argc, char **argv) {return 1;}
 int vgdisplay(int argc, char **argv) {return 1;}
 int vgexport(int argc, char **argv) {return 1;}
-int vgextend(int argc, char **argv) {return 1;}
 int vgimport(int argc, char **argv) {return 1;}
 int vgmerge(int argc, char **argv) {return 1;}
 int vgmknodes(int argc, char **argv) {return 1;}
diff --git a/tools/vgextend.c b/tools/vgextend.c
new file mode 100644
index 000000000..3b449bd25
--- /dev/null
+++ b/tools/vgextend.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2001  Sistina Software
+ *
+ * LVM is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * LVM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LVM; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "tools.h"
+
+int vgextend(int argc, char **argv)
+{
+	char *vg_name;
+	struct volume_group *vg = NULL;
+
+	if (!argc) {
+		log_error("Please enter volume group name and "
+		          "physical volume(s)");
+		return EINVALID_CMD_LINE;
+	}
+
+	if (argc == 1) {
+		log_error("Please enter physical volume(s)");
+		return EINVALID_CMD_LINE;
+	}
+
+	vg_name = argv[0];
+	argc--;
+	argv++;
+
+	log_verbose("Checking for volume group '%s'", vg_name);
+	if (!(vg = ios->vg_read(ios, vg_name))) {
+		log_error("Volume group '%s' not found.", vg_name);
+		return ECMD_FAILED;
+	}
+
+	if (!(vg->status & ACTIVE)) {
+		log_error("Volume group '%s' is not active.", vg_name);
+		return ECMD_FAILED;
+	}
+
+	if (!(vg->status & EXTENDABLE_VG)) {
+		log_error("Volume group '%s' is not extendable.", vg_name);
+		return ECMD_FAILED;
+	}
+
+/********** FIXME
+	log_print("maximum logical volume size is %s",
+		  (dummy = lvm_show_size(LVM_LV_SIZE_MAX(vg) / 2, LONG)));
+	dbg_free(dummy);
+	dummy = NULL;
+**********/
+
+	/* extend vg */
+	if (!vg_extend(ios, vg, argc, argv))
+		return ECMD_FAILED;
+
+	/* ret > 0 */
+	log_verbose("Volume group '%s' will be extended by %d new "
+		    "physical volumes", vg_name, argc);
+
+        /* store vg on disk(s) */
+        if (!ios->vg_write(ios, vg))
+                return ECMD_FAILED;
+
+/********* FIXME
+	if ((ret = do_autobackup(vg_name, vg)))
+		return ret;
+*********/
+
+	log_print("Volume group '%s' successfully extended", vg_name);
+
+	return 0;
+}