Changeset 2764 in MondoRescue

Timestamp:

Apr 20, 2011, 12:18:46 PM (14 years ago)

Author:

Bruno Cornec

Message:

Function resize_drive_proportionately_to_suit_new_drives

• Integrate some mr_asprintf
• Use systematically long long data types in all computation to match the struct mountlist_reference size member and have correct precision
• Apply JB general_at_itpsg.com patch to make the partition resizing work properly according to the drive size (keeping all calculation in KB and converting only for display)

File:

• branches/2.2.9/mondo/src/mondorestore/mondo-prep.c (modified) (6 diffs)

branches/2.2.9/mondo/src/mondorestore/mondo-prep.c

@@ -2464 +2464 @@
 
     /** float ***********************************************************/
-    float factor;
-    float new_size;
-//  float newcylinderno;
+    long long factor;
+    long long new_size;
 
     /** long *************************************************************/
-    long newsizL = 0L;
-    long current_size_of_drive = 0L;
-    long original_size_of_drive = 0L;
-    long final_size = 0L;           /* all in Megabytes */
+    long long newsizL = 0LL;
+    long long totalsizL = 0LL;
+    long long current_size_of_drive = 0LL;  /* use KB interally for precision */
+    long long original_size_of_drive = 0LL; /* use KB interally for precision */
+    long long final_size = 0LL;             /* all in Megabytes */
     struct mountlist_reference *drivemntlist;
 
@@ -2479 +2479 @@
     /** end **************************************************************/
 
-    malloc_string(tmp);
     assert(mountlist != NULL);
     assert_string_is_neither_NULL_nor_zerolength(drive_name);
@@ -2486 +2485 @@
         if (strncmp(drive_name, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))
             == 0) {
-            paranoid_free(tmp);
             return;
         }
     }
 
-    current_size_of_drive = get_phys_size_of_drive(drive_name);
-
-    if (current_size_of_drive <= 0) {
+    current_size_of_drive = (long long) get_phys_size_of_drive(drive_name) * 1024LL;
+
+    if (current_size_of_drive <= 0LL) {
         log_it("Not resizing to match %s - can't find drive", drive_name);
-        paranoid_free(tmp);
         return;
     }
-    sprintf(tmp, "Expanding entries to suit drive %s (%ld MB)", drive_name,
-            current_size_of_drive);
+    mr_asprintf(&tmp, "Expanding entries to suit drive %s (%lld MB)", drive_name, current_size_of_drive / 1024);
     log_to_screen(tmp);
+    mr_free(tmp);
 
     drivemntlist = malloc(sizeof(struct mountlist_reference));
@@ -2512 +2509 @@
 
     for (partno = 0; partno < drivemntlist->entries; partno++) {
-        if (drivemntlist->el[partno]->size > 0) {
-            original_size_of_drive += (drivemntlist->el[partno]->size / 1024L);
+        if (drivemntlist->el[partno]->size > 0LL) {
+            /* Keep KB here */
+            original_size_of_drive += drivemntlist->el[partno]->size;
         }
     }
 
     if (original_size_of_drive <= 0) {
-        sprintf(tmp, "Cannot resize %s's entries. Drive not found.",
-                drive_name);
+        mr_asprintf(&tmp, "Cannot resize %s's entries. Drive not found.", drive_name);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return;
     }
-    factor =
-        (float) (current_size_of_drive) / (float) (original_size_of_drive);
-    sprintf(tmp, "Disk %s was %ld MB; is now %ld MB; factor = %f",
-            drive_name, original_size_of_drive, current_size_of_drive,
-            factor);
+    factor = (current_size_of_drive) / (original_size_of_drive);
+    mr_asprintf(&tmp, "Disk %s was %lld MB; is now %lld MB; Proportionally resizing partitions (factor ~= %lld)",
+            drive_name, original_size_of_drive/1024, current_size_of_drive/1024, factor);
     log_to_screen(tmp);
+    mr_free(tmp);
 
     lastpart = drivemntlist->entries - 1;
@@ -2535 +2531 @@
         /* the 'atoi' thing is to make sure we don't try to resize _images_, whose formats will be numeric */
         if (!atoi(drivemntlist->el[partno]->format)) {
-            new_size = (float) (drivemntlist->el[partno]->size) * factor;
+            new_size = (drivemntlist->el[partno]->size) * factor;
         } else {
             new_size = drivemntlist->el[partno]->size;
@@ -2544 +2540 @@
                     drivemntlist->el[partno]->device,
                     drivemntlist->el[partno]->mountpoint);
-            newsizL = (long) new_size;  // It looks wrong but it's not
-        } else {
-            newsizL = (long) new_size;
-        }
+        }
+        newsizL = new_size;
 
         /* Do not apply the factor if partition was of negative size */
-        if (newsizL < 0) {
+        if (newsizL < 0LL) {
             newsizL = drivemntlist->el[partno]->size;
         }
-
-        sprintf(tmp, "Changing %s from %lld KB to %ld KB",
-                drivemntlist->el[partno]->device,
-                drivemntlist->el[partno]->size, newsizL);
+        totalsizL += newsizL;
+
+        mr_asprintf(&tmp, "Changing %s from %lld KB to %lld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
         log_to_screen(tmp);
+        mr_free(tmp);
         drivemntlist->el[partno]->size = newsizL;
     }
-    final_size = get_phys_size_of_drive(drive_name);
-    sprintf(tmp, "final_size = %ld MB", final_size);
+    // Ensures over-allocation alert and prompt for interactive mode does not happen
+    if (totalsizL > current_size_of_drive) {
+        mr_asprintf(&tmp, "Last partition size calculated would be over-allocated, reducing %s from %lld KB to %lld KB.", drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size - (totalsizL - current_size_of_drive));
+        drivemntlist->el[drivemntlist->entries-1]->size -= (totalsizL - current_size_of_drive);
+    } else if (totalsizL < current_size_of_drive) {
+        mr_asprintf(&tmp, "Last partition size calculated would be under-allocated, increasing %s from %lld KB to %lld KB.",drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size + (current_size_of_drive - totalsizL));
+        drivemntlist->el[drivemntlist->entries-1]->size += (current_size_of_drive - totalsizL);
+    }
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
+    mr_asprintf(&tmp, "final_size = %lld MB", current_size_of_drive / 1024);
+    log_to_screen(tmp);
+    mr_free(tmp);
 }