From: Alasdair Kergon <agk@redhat.com>
Date: Tue, 6 Sep 2011 22:43:56 +0000 (+0000)
Subject: pool attach fns & more field renaming
X-Git-Tag: v2_02_91~590
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=bb6f9b10db478217585860e719d12dd062d9d728;p=lvm2.git

pool attach fns & more field renaming
---

diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index f1c0db605..413bcf2a6 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -257,7 +257,7 @@ struct lv_segment *alloc_lv_segment(struct dm_pool *mem,
 
 	if (log_lv) {
 		if (thin_pool_lv) {
-			if (!attach_pool_metadata(seg, log_lv))
+			if (!attach_pool_metadata_lv(seg, log_lv))
 				return_NULL;
 		} else if (!attach_mirror_log(seg, log_lv))
 			return_NULL;
diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c
index 3c4600938..9f7b3c99e 100644
--- a/lib/metadata/merge.c
+++ b/lib/metadata/merge.c
@@ -313,7 +313,7 @@ static int _lv_split_segment(struct logical_volume *lv, struct lv_segment *seg,
 	if (!(split_seg = alloc_lv_segment(lv->vg->vgmem, seg->segtype,
 					   seg->lv, seg->le, seg->len,
 					   seg->status, seg->stripe_size,
-					   seg->log_lv, seg->thin_pool_lv,
+					   seg->log_lv, seg->pool_lv,
 					   seg->area_count, seg->area_len,
 					   seg->chunk_size, seg->region_size,
 					   seg->extents_copied, seg->pvmove_source_seg))) {
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 4948f0daa..b531195c3 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -85,6 +85,8 @@
 
 #define THIN_VOLUME		UINT64_C(0x0000001000000000)	/* LV */
 #define THIN_POOL		UINT64_C(0x0000002000000000)	/* LV */
+#define THIN_POOL_DATA		UINT64_C(0x0000002000000000)	/* LV */
+#define THIN_POOL_METADATA	UINT64_C(0x0000004000000000)	/* LV */
 
 #define LVM_READ		0x00000100U	/* LV VG 32-bit */
 #define LVM_WRITE		0x00000200U	/* LV VG 32-bit */
@@ -134,6 +136,8 @@
 
 #define lv_is_thin_volume(lv)	((lv)->status & THIN_VOLUME ? 1 : 0)
 #define lv_is_thin_pool(lv)	((lv)->status & THIN_POOL ? 1 : 0)
+#define lv_is_thin_pool_data(lv)	((lv)->status & THIN_POOL_DATA ? 1 : 0)
+#define lv_is_thin_pool_metadata(lv)	((lv)->status & THIN_POOL_METADATA ? 1 : 0)
 #define lv_is_mirrored(lv)	((lv)->status & MIRRORED ? 1 : 0)
 #define lv_is_rlog(lv)		((lv)->status & REPLICATOR_LOG ? 1 : 0)
 
@@ -322,12 +326,12 @@ struct lv_segment {
 	struct dm_list tags;
 
 	struct lv_segment_area *areas;
-	struct lv_segment_area *meta_areas; /* For RAID */
-	struct logical_volume *pool_lv;		/* For thin_pool */
-	struct logical_volume *metadata_lv;	/* For thin_pool */
+	struct lv_segment_area *meta_areas;	/* For RAID */
+	struct logical_volume *pool_data_lv;	/* For thin_pool */
+	struct logical_volume *pool_metadata_lv;/* For thin_pool */
 	uint64_t transaction_id;		/* For thin_pool */
 	uint32_t zero_new_blocks;		/* For thin_pool */
-	struct logical_volume *thin_pool_lv;	/* For thin */
+	struct logical_volume *pool_lv;		/* For thin */
 	uint64_t device_id;			/* For thin */
 
 	struct logical_volume *replicator;/* For replicator-devs - link to replicator LV */
diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h
index d48c6cc77..8350a870a 100644
--- a/lib/metadata/metadata.h
+++ b/lib/metadata/metadata.h
@@ -442,9 +442,11 @@ int fixup_imported_mirrors(struct volume_group *vg);
 /*
  * From thin_manip.c
  */
-int attach_pool_metadata(struct lv_segment *seg,
-			 struct logical_volume *thin_pool_metadata);
-int attach_pool_lv(struct lv_segment *seg, struct logical_volume *thin_pool_lv);
+int attach_pool_metadata_lv(struct lv_segment *seg,
+			    struct logical_volume *pool_metadata_lv);
+int attach_pool_data_lv(struct lv_segment *seg,
+			struct logical_volume *pool_data_lv);
+int attach_pool_lv(struct lv_segment *seg, struct logical_volume *pool_lv);
 
 /*
  * Begin skeleton for external LVM library
diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c
index 3f5207377..8329d13a9 100644
--- a/lib/metadata/thin_manip.c
+++ b/lib/metadata/thin_manip.c
@@ -15,19 +15,28 @@
 #include "lib.h"
 #include "metadata.h"
 
-int attach_pool_metadata(struct lv_segment *seg, struct logical_volume *thin_pool_metadata)
+int attach_pool_metadata_lv(struct lv_segment *seg, struct logical_volume *pool_metadata_lv)
 {
-	// FIXME Housekeeping needed here (cf attach_mirror_log)
-	seg->metadata_lv = thin_pool_metadata;
+	seg->pool_metadata_lv = pool_metadata_lv;
+	pool_metadata_lv->status |= THIN_POOL_METADATA;
+        lv_set_hidden(pool_metadata_lv);
 
-	return 1;
+        return add_seg_to_segs_using_this_lv(pool_metadata_lv, seg);
 }
 
-int attach_pool_lv(struct lv_segment *seg, struct logical_volume *thin_pool_lv)
+int attach_pool_data_lv(struct lv_segment *seg, struct logical_volume *pool_data_lv)
 {
-	// FIXME Housekeeping needed here (cf attach_mirror_log)
-	seg->thin_pool_lv = thin_pool_lv;
+	seg->pool_data_lv = pool_data_lv;
+	pool_data_lv->status |= THIN_POOL_DATA;
+        lv_set_hidden(pool_data_lv);
 
-	return 1;
+        return add_seg_to_segs_using_this_lv(pool_data_lv, seg);
 }
 
+int attach_pool_lv(struct lv_segment *seg, struct logical_volume *pool_lv)
+{
+	seg->pool_lv = pool_lv;
+	pool_lv->status |= THIN_POOL;
+
+        return add_seg_to_segs_using_this_lv(pool_lv, seg);
+}
diff --git a/lib/thin/thin.c b/lib/thin/thin.c
index 2a3546cad..4759dbbd2 100644
--- a/lib/thin/thin.c
+++ b/lib/thin/thin.c
@@ -47,21 +47,26 @@ static int _thin_pool_text_import(struct lv_segment *seg, const struct dm_config
 			struct dm_hash_table *pv_hash __attribute__((unused)))
 {
 	const char *lv_name;
+	struct logical_volume *pool_data_lv, *pool_metadata_lv;
 
 	if (!dm_config_get_str(sn, "pool", &lv_name))
 		return SEG_LOG_ERROR("Pool must be a string in");
 
-// Use attach_pool_lv
-	if (!(seg->pool_lv = find_lv(seg->lv->vg, lv_name)))
+	if (!(pool_data_lv = find_lv(seg->lv->vg, lv_name)))
 		return SEG_LOG_ERROR("Unknown pool %s in", lv_name);
 
 	if (!dm_config_get_str(sn, "metadata", &lv_name))
 		return SEG_LOG_ERROR("Metadata must be a string in");
 
-// Use attach_pool_metadata()
-	if (!(seg->metadata_lv = find_lv(seg->lv->vg, lv_name)))
+	if (!(pool_metadata_lv = find_lv(seg->lv->vg, lv_name)))
 		return SEG_LOG_ERROR("Unknown metadata %s in", lv_name);
 
+	if (!attach_pool_metadata_lv(seg, pool_metadata_lv))
+		return_0;
+
+	if (!attach_pool_data_lv(seg, pool_data_lv))
+		return_0;
+
 	if (!dm_config_get_uint64(sn, "transaction_id", &seg->transaction_id))
 		return SEG_LOG_ERROR("Could not read transaction_id for");
 
@@ -74,8 +79,8 @@ static int _thin_pool_text_import(struct lv_segment *seg, const struct dm_config
 
 static int _thin_pool_text_export(const struct lv_segment *seg, struct formatter *f)
 {
-	outf(f, "pool = \"%s\"", seg->pool_lv->name);
-	outf(f, "metadata = \"%s\"", seg->metadata_lv->name);
+	outf(f, "pool = \"%s\"", seg->pool_data_lv->name);
+	outf(f, "metadata = \"%s\"", seg->pool_metadata_lv->name);
 	outf(f, "transaction_id = %" PRIu64, seg->transaction_id);
 	if (seg->zero_new_blocks)
 		outf(f, "zero_new_blocks = 1");
@@ -92,13 +97,17 @@ static int _thin_text_import(struct lv_segment *seg, const struct dm_config_node
 			struct dm_hash_table *pv_hash __attribute__((unused)))
 {
 	const char *lv_name;
+	struct logical_volume *pool_lv;
 
 	if (!dm_config_get_str(sn, "thin_pool", &lv_name))
 		return SEG_LOG_ERROR("Thin pool must be a string in");
 
-	if (!(seg->thin_pool_lv = find_lv(seg->lv->vg, lv_name)))
+	if (!(pool_lv = find_lv(seg->lv->vg, lv_name)))
 		return SEG_LOG_ERROR("Unknown thin pool %s in", lv_name);
 
+	if (!attach_pool_lv(seg, pool_lv))
+		return_0;
+
 	if (dm_config_has_node(sn, "origin")) {
 		if (!dm_config_get_str(sn, "origin", &lv_name))
 			return SEG_LOG_ERROR("Origin must be a string in");
@@ -115,7 +124,7 @@ static int _thin_text_import(struct lv_segment *seg, const struct dm_config_node
 
 static int _thin_text_export(const struct lv_segment *seg, struct formatter *f)
 {
-	outf(f, "thin_pool = \"%s\"", seg->thin_pool_lv->name);
+	outf(f, "thin_pool = \"%s\"", seg->pool_lv->name);
 	outf(f, "device_id = %" PRIu64, seg->device_id);
 
 	if (seg->origin)
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index e8722a3fa..2fd9a6989 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -198,13 +198,12 @@ static int _determine_snapshot_type(struct volume_group *vg,
 		return 0;
 	}
 
-	/* FIXME Replace with lv_is_thin_volume() once more flags are added */
 	if (lv_is_thin_volume(lvl->lv)) {
 		lp->thin = 1;
 		if (!(lp->segtype = get_segtype_from_string(vg->cmd, "thin")))
 			return_0;
 
-		lp->pool = first_seg(lvl->lv)->thin_pool_lv->name;
+		lp->pool = first_seg(lvl->lv)->pool_lv->name;
 	}
 
 	if (!lp->thin && !arg_count(vg->cmd, extents_ARG) && !arg_count(vg->cmd, size_ARG)) {