Changeset 2665 in MondoRescue for branches

Timestamp:

Jun 24, 2010, 12:21:56 AM (15 years ago)

Author:

Bruno Cornec

Message:

r3925@localhost: bruno | 2010-06-23 00:13:12 +0200

• Try to provide a workaround in code to the #401 (over-allocation of space due to rounding errors)

File:

• branches/2.2.9/mondo/src/common/libmondo-mountlist.c (modified) (1 diff)

branches/2.2.9/mondo/src/common/libmondo-mountlist.c

@@ -324 +324 @@
         /* OK, continue with main loop */
         amount_allocated += mountlist->el[pos].size / 1024L;
+
+        /* This should only happen at the end but not tested now */
+        if (amount_allocated > physical_drive_size) { 
+            // Used to be +1, but what if you're 1 MB too high?
+            mr_asprintf(&tmp, " %ld MB over-allocated on %s.",
+                    amount_allocated - physical_drive_size, drive);
+            log_it(tmp);
+
+            /* Do we have more than 1 MB per partition ? */
+            if (amount_allocated - physical_drive_size <= curr_part_no) {
+                /* Probably a rouding error, just passing over 
+                 * by reducing the last partition if possible */
+                amount_allocated -= mountlist->el[pos].size / 1024L;
+                mountlist->el[pos].size =  (mountlist->el[pos].size - curr_part_no*1024L);
+                amount_allocated += mountlist->el[pos].size / 1024L;
+            } else {
+                mr_strcat(flaws_str, "%s", tmp);
+                res++;
+            }
+            mr_free(tmp);
+        }
         prev_part_no = curr_part_no;
     }
 
     /* Over-allocated the disk? Unallocated space on disk? */
-    if (amount_allocated > physical_drive_size) // Used to be +1, but what if you're 1 MB too high?
-    {
-        mr_asprintf(&tmp, " %ld MB over-allocated on %s.",
-                amount_allocated - physical_drive_size, drive);
-        log_it(tmp);
-        mr_strcat(flaws_str, "%s", tmp);
-        mr_free(tmp);
-        res++;
-    } else if (amount_allocated < physical_drive_size - 1) {    /* NOT AN ERROR, JUST A WARNING :-) */
+    if (amount_allocated < physical_drive_size - 1) {   /* NOT AN ERROR, JUST A WARNING :-) */
         mr_asprintf(&tmp, " %ld MB unallocated on %s.",
                 physical_drive_size - amount_allocated, drive);