From 4c8a72d2e264a88ae7c7d1a44b16c34205e3b745 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 20 Oct 2011 14:53:13 +0100
Subject: [PATCH] resize: Remove p_size field from partitions structure.

This field simply contained a duplicate copy of p_part.part_size.

There is no functional change in this commit.
(cherry picked from commit 9f198956047583e506713a4472117922f8b27b2e)
---
 resize/resize.ml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/resize/resize.ml b/resize/resize.ml
index 8ee6faa..b4af809 100644
--- a/resize/resize.ml
+++ b/resize/resize.ml
@@ -239,7 +239,6 @@ let () =
 (* Build a data structure describing the source disk's partition layout. *)
 type partition = {
   p_name : string;               (* Device name, like /dev/sda1. *)
-  p_size : int64;                (* Current size of this partition. *)
   p_part : G.partition;          (* Partition data from libguestfs. *)
   p_bootable : bool;             (* Is it bootable? *)
   p_mbr_id : int option;         (* MBR ID, if it has one. *)
@@ -320,7 +319,7 @@ let partitions : partition list =
           with G.Error _ -> None in
         let typ = get_partition_content name in
 
-        { p_name = name; p_size = part.G.part_size; p_part = part;
+        { p_name = name; p_part = part;
           p_bootable = bootable; p_mbr_id = mbr_id; p_type = typ;
           p_operation = OpCopy; p_target_partnum = 0 }
     ) parts in
@@ -336,11 +335,13 @@ let partitions : partition list =
    *)
   List.iter (
     function
-    | { p_name = name; p_size = size; p_type = ContentPV pv_size }
+    | { p_name = name; p_part = { G.part_size = size };
+        p_type = ContentPV pv_size }
         when size < pv_size ->
         error "%s: partition size %Ld < physical volume size %Ld"
           name size pv_size
-    | { p_name = name; p_size = size; p_type = ContentFS (_, fs_size) }
+    | { p_name = name; p_part = { G.part_size = size };
+        p_type = ContentFS (_, fs_size) }
         when size < fs_size ->
         error "%s: partition size %Ld < filesystem size %Ld"
           name size fs_size
@@ -485,7 +486,7 @@ let () =
  *)
 let mark_partition_for_resize ~option ?(force = false) p newsize =
   let name = p.p_name in
-  let oldsize = p.p_size in
+  let oldsize = p.p_part.G.part_size in
 
   (match p.p_operation with
    | OpResize _ ->
@@ -539,7 +540,7 @@ let () =
     let p = find_partition ~option dev in
 
     (* Parse the size field. *)
-    let oldsize = p.p_size in
+    let oldsize = p.p_part.G.part_size in
     let newsize = parse_size oldsize sizefield in
 
     if newsize <= 0L then
@@ -571,7 +572,7 @@ let calculate_surplus () =
     fun total p ->
       let newsize =
         match p.p_operation with
-        | OpCopy | OpIgnore -> p.p_size
+        | OpCopy | OpIgnore -> p.p_part.G.part_size
         | OpDelete -> 0L
         | OpResize newsize -> newsize in
       total +^ newsize
@@ -599,7 +600,7 @@ let () =
 
          let option = "--expand" in
          let p = find_partition ~option dev in
-         let oldsize = p.p_size in
+         let oldsize = p.p_part.G.part_size in
          mark_partition_for_resize ~option p (oldsize +^ surplus)
     );
     (match shrink with
@@ -610,7 +611,7 @@ let () =
 
          let option = "--shrink" in
          let p = find_partition ~option dev in
-         let oldsize = p.p_size in
+         let oldsize = p.p_part.G.part_size in
          mark_partition_for_resize ~option p (oldsize +^ surplus)
     )
   )
@@ -653,7 +654,7 @@ let () =
     printf "Summary of changes:\n\n";
 
     List.iter (
-      fun ({ p_name = name; p_size = oldsize } as p) ->
+      fun ({ p_name = name; p_part = { G.part_size = oldsize }} as p) ->
         let text =
           match p.p_operation with
           | OpCopy ->
@@ -813,7 +814,7 @@ let () =
           | OpDelete -> None            (* do nothing *)
           | OpIgnore | OpCopy ->        (* new partition, same size *)
               (* Size in sectors. *)
-              let size = (p.p_size +^ sectsize -^ 1L) /^ sectsize in
+              let size = (p.p_part.G.part_size +^ sectsize -^ 1L) /^ sectsize in
               Some (add_partition size)
           | OpResize newsize ->         (* new partition, resized *)
               (* Size in sectors. *)
@@ -883,7 +884,7 @@ let () =
     | ({ p_name = source; p_target_partnum = target_partnum;
          p_operation = (OpCopy | OpResize _) } as p) :: ps
         when target_partnum > 0 ->
-        let oldsize = p.p_size in
+        let oldsize = p.p_part.G.part_size in
         let newsize =
           match p.p_operation with OpResize s -> s | _ -> oldsize in
 
-- 
1.8.3.1