Thin rename seg var pool_metadata_lv to metadata_lv

Better fits the code.

7 files changed, 20 insertions, 20 deletions

diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 0036bac8..b853ebc2 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -1160,7 +1160,7 @@ static int _add_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
 		return_0;
 
 	if (lv_is_thin_pool(lv)) {
-		if (!_add_lv_to_dtree(dm, dtree, seg->pool_metadata_lv, origin_only))
+		if (!_add_lv_to_dtree(dm, dtree, seg->metadata_lv, origin_only))
 			return_0;
 		/* FIXME code from _create_partial_dtree() should be moved here */
 		if (!_add_lv_to_dtree(dm, dtree, seg_lv(seg, 0), origin_only))
@@ -1566,7 +1566,7 @@ static int _add_segment_to_dtree(struct dev_manager *dm,
 			return_0;
 	} else {
 		if (seg_is_thin_pool(seg) &&
-		    !_add_new_lv_to_dtree(dm, dtree, seg->pool_metadata_lv, laopts, NULL))
+		    !_add_new_lv_to_dtree(dm, dtree, seg->metadata_lv, laopts, NULL))
 			return_0;
 
 		/* Add any LVs used by this segment */
diff --git a/lib/display/display.c b/lib/display/display.c
index e42e9dc5..9f3f187a 100644
--- a/lib/display/display.c
+++ b/lib/display/display.c
@@ -564,7 +564,7 @@ int lvdisplay_full(struct cmd_context *cmd,
 		log_print("LV Thin transaction ID %" PRIu64,
 			  first_seg(lv)->transaction_id);
 		log_print("LV Thin metadata       %s%s/%s", lv->vg->cmd->dev_dir,
-			  lv->vg->name, first_seg(lv)->pool_metadata_lv->name);
+			  lv->vg->name, first_seg(lv)->metadata_lv->name);
 		log_print("LV Thin data pool      %s%s/%s", lv->vg->cmd->dev_dir,
 			  lv->vg->name, seg_lv(first_seg(lv), 0)->name);
 		log_print("LV Zero new blocks     %s",
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 0675350c..02ab5834 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -523,7 +523,7 @@ static int _lv_reduce(struct logical_volume *lv, uint32_t extents, int delete)
 			if (seg->log_lv && !lv_remove(seg->log_lv))
 				return_0;
 
-			if (seg->pool_metadata_lv && !lv_remove(seg->pool_metadata_lv))
+			if (seg->metadata_lv && !lv_remove(seg->metadata_lv))
 				return_0;
 
 			if (seg->pool_lv) {
@@ -2788,7 +2788,7 @@ int for_each_sub_lv(struct cmd_context *cmd, struct logical_volume *lv,
 			if (!for_each_sub_lv(cmd, seg->log_lv, fn, data))
 				return_0;
 		}
-		if (seg->pool_metadata_lv && !fn(cmd, seg->pool_metadata_lv, data))
+		if (seg->metadata_lv && !fn(cmd, seg->metadata_lv, data))
 			return_0;
 		for (s = 0; s < seg->area_count; s++) {
 			if (seg_type(seg, s) != AREA_LV)
diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c
index e691176f..527488e6 100644
--- a/lib/metadata/merge.c
+++ b/lib/metadata/merge.c
@@ -102,7 +102,7 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
 
 		if (lv_is_thin_pool_metadata(lv) &&
 		    (!(seg2 = first_seg(lv)) || !(seg2 = find_pool_seg(seg2)) ||
-		     seg2->pool_metadata_lv != lv)) {
+		     seg2->metadata_lv != lv)) {
 			log_error("LV %s: segment 1 pool metadata LV does not point back to same LV",
 				  lv->name);
 			inc_error_count;
@@ -191,11 +191,11 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
 					inc_error_count;
 				}
 
-				if (!seg->pool_metadata_lv) {
+				if (!seg->metadata_lv) {
 					log_error("LV %s: thin pool segment %u is missing a pool metadata LV",
 						  lv->name, seg_count);
 					inc_error_count;
-				} else if (!(seg2 = first_seg(seg->pool_metadata_lv)) ||
+				} else if (!(seg2 = first_seg(seg->metadata_lv)) ||
 					   find_pool_seg(seg2) != seg) {
 					log_error("LV %s: thin pool segment %u metadata LV does not refer back to pool LV",
 						  lv->name, seg_count);
@@ -209,7 +209,7 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
 					inc_error_count;
 				}
 			} else {
-				if (seg->pool_metadata_lv) {
+				if (seg->metadata_lv) {
 					log_error("LV %s: segment %u must not have thin pool metadata LV set",
 						  lv->name, seg_count);
 					inc_error_count;
@@ -371,7 +371,7 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
 				seg_found++;
 		if (seg->log_lv == lv)
 			seg_found++;
-		if (seg->pool_metadata_lv == lv || seg->pool_lv == lv)
+		if (seg->metadata_lv == lv || seg->pool_lv == lv)
 			seg_found++;
 		if (seg_is_thin_volume(seg) && seg->origin == lv)
 			seg_found++;
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index f516f3d0..941e710f 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -345,7 +345,7 @@ struct lv_segment {
 
 	struct lv_segment_area *areas;
 	struct lv_segment_area *meta_areas;	/* For RAID */
-	struct logical_volume *pool_metadata_lv;/* For thin_pool */
+	struct logical_volume *metadata_lv;	/* For thin_pool */
 	uint64_t transaction_id;		/* For thin_pool, thin */
 	uint64_t low_water_mark;		/* For thin_pool */
 	uint32_t data_block_size;		/* For thin_pool, 128..2097152 */
diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c
index c54872cd..ef54b020 100644
--- a/lib/metadata/thin_manip.c
+++ b/lib/metadata/thin_manip.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2011-2012 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -20,13 +20,13 @@
 #include "lv_alloc.h"
 #include "archiver.h"
 
-int attach_pool_metadata_lv(struct lv_segment *seg, struct logical_volume *pool_metadata_lv)
+int attach_pool_metadata_lv(struct lv_segment *seg, struct logical_volume *metadata_lv)
 {
-	seg->pool_metadata_lv = pool_metadata_lv;
-	pool_metadata_lv->status |= THIN_POOL_METADATA;
-	lv_set_hidden(pool_metadata_lv);
+	seg->metadata_lv = metadata_lv;
+	metadata_lv->status |= THIN_POOL_METADATA;
+	lv_set_hidden(metadata_lv);
 
-	return add_seg_to_segs_using_this_lv(pool_metadata_lv, seg);
+	return add_seg_to_segs_using_this_lv(metadata_lv, seg);
 }
 
 int attach_pool_data_lv(struct lv_segment *seg, struct logical_volume *pool_data_lv)
diff --git a/lib/thin/thin.c b/lib/thin/thin.c
index d48445f3..7f5bfc7f 100644
--- a/lib/thin/thin.c
+++ b/lib/thin/thin.c
@@ -152,7 +152,7 @@ static int _thin_pool_text_export(const struct lv_segment *seg, struct formatter
 	unsigned cnt = 0;
 	const struct lv_thin_message *tmsg;
 
-	outf(f, "metadata = \"%s\"", seg->pool_metadata_lv->name);
+	outf(f, "metadata = \"%s\"", seg->metadata_lv->name);
 	outf(f, "pool = \"%s\"", seg_lv(seg, 0)->name);
 	outf(f, "transaction_id = %" PRIu64, seg->transaction_id);
 // FIXME  maybe switch to use  chunksize (as with snapshot ??)
@@ -240,9 +240,9 @@ static int _thin_pool_add_target_line(struct dev_manager *dm,
 		return 1;
 	}
 
-	if (!(metadata_dlid = build_dm_uuid(mem, seg->pool_metadata_lv->lvid.s, NULL))) {
+	if (!(metadata_dlid = build_dm_uuid(mem, seg->metadata_lv->lvid.s, NULL))) {
 		log_error("Failed to build uuid for metadata LV %s.",
-			  seg->pool_metadata_lv->name);
+			  seg->metadata_lv->name);
 		return 0;
 	}