From 70121705ba6c58dcb39ed9b8c1d314be110d0cb9 Mon Sep 17 00:00:00 2001
From: Dave Wysochanski <dwysocha@redhat.com>
Date: Wed, 13 Jun 2007 22:30:26 +0000
Subject: [PATCH] Convert pv->pe_size to get_pv_pe_size

---
 tools/pvdisplay.c |  3 ++-
 tools/pvresize.c  |  2 +-
 tools/pvscan.c    | 19 ++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/tools/pvdisplay.c b/tools/pvdisplay.c
index bd0553441..53b63b85d 100644
--- a/tools/pvdisplay.c
+++ b/tools/pvdisplay.c
@@ -59,7 +59,8 @@ static int _pvdisplay_single(struct cmd_context *cmd,
 	if (!*pv->vg_name)
 		size = pv->size;
 	else
-		size = (pv->pe_count - get_pv_pe_alloc_count(pv)) * pv->pe_size;
+		size = (get_pv_pe_count(pv) - get_pv_pe_alloc_count(pv)) * 
+			get_pv_pe_size(pv);
 
 	if (arg_count(cmd, short_ARG)) {
 		log_print("Device \"%s\" has a capacity of %s", pv_name,
diff --git a/tools/pvresize.c b/tools/pvresize.c
index a93181768..4f0593efa 100644
--- a/tools/pvresize.c
+++ b/tools/pvresize.c
@@ -142,7 +142,7 @@ static int _pvresize_single(struct cmd_context *cmd,
 			log_error("%s: Size must leave space for at "
 				  "least one physical extent of "
 				  "%" PRIu32 " sectors.", pv_name,
-				  pv->pe_size);
+				  get_pv_pe_size(pv));
 			unlock_vg(cmd, vg_name);
 			return ECMD_FAILED;
 		}
diff --git a/tools/pvscan.c b/tools/pvscan.c
index e1fa54485..91aa439eb 100644
--- a/tools/pvscan.c
+++ b/tools/pvscan.c
@@ -78,10 +78,10 @@ static void _pvscan_display_single(struct cmd_context *cmd,
 			  pv_max_name_len, pv_tmp_name,
 			  vg_name_this,
 			  display_size(cmd, (uint64_t) get_pv_pe_count(pv) *
-				       pv->pe_size),
-			  display_size(cmd, (uint64_t) (pv->pe_count -
-							pv->pe_alloc_count)
-				       * pv->pe_size));
+				       get_pv_pe_size(pv)),
+			  display_size(cmd, (uint64_t) (get_pv_pe_count(pv) -
+						get_pv_pe_alloc_count(pv))
+				       * get_pv_pe_size(pv)));
 		return;
 	}
 
@@ -89,10 +89,11 @@ static void _pvscan_display_single(struct cmd_context *cmd,
 	log_print("PV %-*s VG %-*s %s [%s / %s free]", pv_max_name_len,
 		  pv_tmp_name, vg_max_name_len, vg_tmp_name,
 		  pv->fmt ? pv->fmt->name : "    ",
-		  display_size(cmd, (uint64_t) get_pv_pe_count(pv) * pv->pe_size),
-		  display_size(cmd,
-			       (uint64_t) (pv->pe_count - get_pv_pe_alloc_count(pv)) *
-					   pv->pe_size));
+		  display_size(cmd, (uint64_t) get_pv_pe_count(pv) * 
+					       get_pv_pe_size(pv)),
+		  display_size(cmd, (uint64_t) (get_pv_pe_count(pv) - 
+						get_pv_pe_alloc_count(pv)) *
+					   get_pv_pe_size(pv)));
 	return;
 }
 
@@ -158,7 +159,7 @@ int pvscan(struct cmd_context *cmd, int argc __attribute((unused)),
 			size_new += pv->size;
 			size_total += pv->size;
 		} else
-			size_total += get_pv_pe_count(pv) * pv->pe_size;
+			size_total += get_pv_pe_count(pv) * get_pv_pe_size(pv);
 	}
 
 	/* find maximum pv name length */