Changeset b7a4d06 in mainline for uspace/lib/label/src/mbr.c

Timestamp:

2015-07-18T12:55:12Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c43db5f

Parents:

70815a24

Message:

Most of extended (but not logical) partition support.

File:

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

uspace/lib/label/src/mbr.c

@@ -122 +122 @@
 
         list_initialize(&label->parts);
+        list_initialize(&label->pri_parts);
+        list_initialize(&label->log_parts);
 
         /* Verify boot record signature */
@@ -130 +132 @@
         }
 
+        label->ext_part_idx = -1;
         for (entry = 0; entry < mbr_nprimary; entry++) {
                 eptr = &mbr->pte[entry];
@@ -187 +190 @@
 
         list_initialize(&label->parts);
+        list_initialize(&label->pri_parts);
+        list_initialize(&label->log_parts);
 
         mbr->media_id = 0;
@@ -210 +215 @@
         label->anblocks = nblocks - mbr_ablock0;
         label->pri_entries = mbr_nprimary;
+        label->ext_part_idx = -1;
 
         *rlabel = label;
@@ -225 +231 @@
         part = mbr_part_first(label);
         while (part != NULL) {
-                list_remove(&part->llabel);
+                list_remove(&part->lparts);
+                if (link_used(&part->lpri))
+                        list_remove(&part->lpri);
+                if (link_used(&part->llog))
+                        list_remove(&part->llog);
                 free(part);
 
@@ -273 +283 @@
         linfo->dcnt = dc_label;
         linfo->ltype = lt_mbr;
+
+        /* We support extended partitions */
+        linfo->flags = lf_ext_supp;
+
+        /** Can create primary if there is a free slot */
+        if (list_count(&label->pri_parts) < mbr_nprimary)
+                linfo->flags |= lf_can_create_pri;
+        /* Can create extended if there is a free slot and no extended */
+        if ((linfo->flags & lf_can_create_pri) != 0 && label->ext_part_idx < 0)
+                linfo->flags |= lf_can_create_ext;
+        /* Can create logical if there is an extended partition */
+        if (label->ext_part_idx >= 0)
+                linfo->flags |= lf_can_create_log;
+
         linfo->ablock0 = label->ablock0;
         linfo->anblocks = label->anblocks;
+
         return EOK;
 }
@@ -286 +311 @@
                 return NULL;
 
-        return list_get_instance(link, label_part_t, llabel);
+        return list_get_instance(link, label_part_t, lparts);
 }
 
@@ -293 +318 @@
         link_t *link;
 
-        link = list_next(&part->llabel, &part->label->parts);
+        link = list_next(&part->lparts, &part->label->parts);
         if (link == NULL)
                 return NULL;
 
-        return list_get_instance(link, label_part_t, llabel);
-}
-
+        return list_get_instance(link, label_part_t, lparts);
+}
+
+#include <io/log.h>
 static void mbr_part_get_info(label_part_t *part, label_part_info_t *pinfo)
 {
@@ -305 +331 @@
         pinfo->block0 = part->block0;
         pinfo->nblocks = part->nblocks;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "mbr_part_get_info: index=%d ptype=%d",
+            (int)part->index, (int)part->ptype);
+        if (link_used(&part->llog))
+                pinfo->pkind = lpk_logical;
+        else if (part->ptype == mbr_pt_extended)
+                pinfo->pkind = lpk_extended;
+        else
+                pinfo->pkind = lpk_primary;
 }
 
@@ -318 +353 @@
                 return ENOMEM;
 
-        /* XXX Verify index, block0, nblocks */
-
-        if (pspec->index < 1 || pspec->index > label->pri_entries) {
-                rc = EINVAL;
-                goto error;
-        }
 
         /* XXX Check if index is used */
@@ -331 +360 @@
         part->block0 = pspec->block0;
         part->nblocks = pspec->nblocks;
-        part->ptype = pspec->ptype;
-
-        rc = mbr_part_to_pte(part, &pte);
-        if (rc != EOK) {
-                rc = EINVAL;
-                goto error;
-        }
-
-        rc = mbr_pte_update(label, &pte, pspec->index - 1);
-        if (rc != EOK) {
-                rc = EIO;
-                goto error;
-        }
-
-        list_append(&part->llabel, &label->parts);
+
+        switch (pspec->pkind) {
+        case lpk_primary:
+                part->ptype = pspec->ptype;
+                break;
+        case lpk_extended:
+                part->ptype = mbr_pt_extended;
+                if (pspec->ptype != 0) {
+                        rc = EINVAL;
+                        goto error;
+                }
+                if (label->ext_part_idx >= 0) {
+                        rc = EEXISTS;
+                        goto error;
+                }
+                break;
+        case lpk_logical:
+                part->ptype = pspec->ptype;
+                if (pspec->index != 0) {
+                        rc = EINVAL;
+                        goto error;
+                }
+                break;
+        }
+
+        if (pspec->pkind != lpk_logical) {
+                /* Primary or extended partition */
+                /* XXX Verify index, block0, nblocks */
+
+                if (pspec->index < 1 || pspec->index > label->pri_entries) {
+                        rc = EINVAL;
+                        goto error;
+                }
+
+                rc = mbr_part_to_pte(part, &pte);
+                if (rc != EOK) {
+                        rc = EINVAL;
+                        goto error;
+                }
+
+                rc = mbr_pte_update(label, &pte, pspec->index - 1);
+                if (rc != EOK) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                list_append(&part->lparts, &label->parts);
+                list_append(&part->lpri, &label->pri_parts);
+
+                if (pspec->pkind == lpk_extended)
+                        label->ext_part_idx = pspec->index - 1;
+        } else {
+                /* Logical partition */
+                rc = ENOTSUP;
+                goto error;
+        }
 
         *rpart = part;
@@ -367 +437 @@
                 return EIO;
 
-        list_remove(&part->llabel);
+        /* If it was the extended partition, clear ext. part. index */
+        if (part->index - 1 == part->label->ext_part_idx)
+                part->label->ext_part_idx = -1;
+
+        list_remove(&part->lparts);
+        if (link_used(&part->lpri))
+                list_remove(&part->lpri);
+        if (link_used(&part->llog))
+                list_remove(&part->llog);
         free(part);
         return EOK;
@@ -386 +464 @@
                 return EINVAL;
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "mbr_part_to_pte: a0=%" PRIu64
+            " len=%" PRIu64 " ptype=%d", part->block0, part->nblocks,
+            (int)part->ptype);
         memset(pte, 0, sizeof(mbr_pte_t));
         pte->ptype = part->ptype;
@@ -403 +484 @@
 
         /* See UEFI specification 2.0 section 5.2.1 Legacy Master Boot Record */
-        if (pte->ptype == mbr_pt_unused || pte->ptype == mbr_pt_extended ||
-            nblocks == 0)
+        if (pte->ptype == mbr_pt_unused || nblocks == 0)
                 return EOK;
 
@@ -411 +491 @@
                 return ENOMEM;
 
+        part->ptype = pte->ptype;
         part->index = index;
         part->block0 = block0;
@@ -422 +503 @@
 
         part->label = label;
-        list_append(&part->llabel, &label->parts);
+        list_append(&part->lparts, &label->parts);
+        list_append(&part->lpri, &label->pri_parts);
+
+        if (pte->ptype == mbr_pt_extended)
+                label->ext_part_idx = index - 1;
         return EOK;
 }