Changeset 22747e8 in mainline

Timestamp:

2015-08-03T20:23:37Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

83dd743

Parents:

6439741

Message:

Fix setting next EBR entry. Fix deleting first logical partition.

File:

• uspace/lib/label/src/mbr.c (modified) (6 diffs)

uspace/lib/label/src/mbr.c

@@ -237 +237 @@
                 rc = mbr_pte_to_log_part(label, ebr_b0, ethis);
                 if (rc != EOK) {
-                        rc= EIO;
+                        rc = EIO;
                         goto error;
                 }
@@ -627 +627 @@
         mbr_pte_t pte;
         label_part_t *prev;
+        label_part_t *next;
+        uint64_t ep_b0;
         int rc;
 
@@ -659 +661 @@
                                 return EIO;
                         }
+
+                        /* Delete EBR */
+                        rc = mbr_ebr_delete(part->label, part);
+                        if (rc != EOK)
+                                return EIO;
                 } else {
+                        next = mbr_log_part_next(part);
                         list_remove(&part->llog);
-                }
-
-                /* Delete EBR */
-                mbr_ebr_delete(part->label, part);
+
+                        if (next != NULL) {
+                                /*
+                                 * Relocate next partitions EBR to the beginning
+                                 * of extended partition. This also overwrites
+                                 * the EBR of the former first partition.
+                                 */
+
+                                /* First block of extended partition */
+                                ep_b0 = part->label->ext_part->block0;
+
+                                next->hdr_blocks = next->block0 - ep_b0;
+
+                                rc = mbr_ebr_create(part->label, next);
+                                if (rc != EOK) {
+                                        list_prepend(&part->llog, &part->label->log_parts);
+                                        return EIO;
+                                }
+                        } else {
+                                /* Delete EBR */
+                                rc = mbr_ebr_delete(part->label, part);
+                                if (rc != EOK)
+                                        return EIO;
+                        }
+                }
 
                 /* Update indices */
@@ -768 +797 @@
         return EOK;
 }
-#include <stdio.h>
+
 static void mbr_log_part_to_ptes(label_part_t *part, mbr_pte_t *pthis,
     mbr_pte_t *pnext)
@@ -781 +810 @@
         assert(link_used(&part->llog));
         assert(part->block0 >= ep_b0);
-        printf("part->hdr_blocks = %" PRIu64 "\n", part->hdr_blocks);
-        printf("part->block0 = %" PRIu64 "\n", part->block0);
-        printf("ep_b0 = %" PRIu64 "\n", ep_b0);
         assert(part->hdr_blocks <= part->block0 - ep_b0);
 
@@ -796 +822 @@
         /* 'Next' EBR entry */
         if (pnext != NULL) {
-                next = mbr_part_next(part);
+                next = mbr_log_part_next(part);
 
                 memset(pnext, 0, sizeof(mbr_pte_t));