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

Timestamp:

2015-07-18T12:55:12Z (10 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/gpt.c (modified) (14 diffs)

uspace/lib/label/src/gpt.c

@@ -150 +150 @@
 
         list_initialize(&label->parts);
+        list_initialize(&label->pri_parts);
+        list_initialize(&label->log_parts);
 
         for (j = 0; j < 2; j++) {
@@ -300 +302 @@
         label->pri_entries = num_entries;
         label->block_size = bsize;
+        label->ext_part_idx = -1;
 
         label->lt.gpt.hdr_ba[0] = gpt_hdr_ba;
@@ -436 +439 @@
 
         list_initialize(&label->parts);
+        list_initialize(&label->pri_parts);
+        list_initialize(&label->log_parts);
 
         label->ops = &gpt_label_ops;
@@ -444 +449 @@
         label->pri_entries = num_entries;
         label->block_size = bsize;
+        label->ext_part_idx = -1;
 
         label->lt.gpt.hdr_ba[0] = hdr_ba[0];
@@ -468 +474 @@
         part = gpt_part_first(label);
         while (part != NULL) {
-                list_remove(&part->llabel);
+                list_remove(&part->lparts);
+                list_remove(&part->lpri);
                 free(part);
                 part = gpt_part_first(label);
@@ -532 +539 @@
 }
 
+static bool gpt_can_create_pri(label_t *label)
+{
+        return list_count(&label->parts) < (size_t)label->pri_entries;
+}
+
 static int gpt_get_info(label_t *label, label_info_t *linfo)
 {
@@ -537 +549 @@
         linfo->dcnt = dc_label;
         linfo->ltype = lt_gpt;
+        linfo->flags = 0;
+        if (gpt_can_create_pri(label))
+                linfo->flags = linfo->flags | lf_can_create_pri;
         linfo->ablock0 = label->ablock0;
         linfo->anblocks = label->anblocks;
@@ -550 +565 @@
                 return NULL;
 
-        return list_get_instance(link, label_part_t, llabel);
+        return list_get_instance(link, label_part_t, lparts);
 }
 
@@ -557 +572 @@
         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);
 }
 
@@ -567 +582 @@
 {
         pinfo->index = part->index;
+        pinfo->pkind = lpk_primary;
         pinfo->block0 = part->block0;
         pinfo->nblocks = part->nblocks;
@@ -587 +603 @@
 
         if (pspec->index < 1 || pspec->index > label->pri_entries) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        /* GPT only has primary partitions */
+        if (pspec->pkind != lpk_primary) {
                 rc = EINVAL;
                 goto error;
@@ -614 +636 @@
         }
 
-        list_append(&part->llabel, &label->parts);
+        list_append(&part->lparts, &label->parts);
+        list_append(&part->lpri, &label->pri_parts);
 
         *rpart = part;
@@ -636 +659 @@
                 return EIO;
 
-        list_remove(&part->llabel);
+        list_remove(&part->lparts);
+        list_remove(&part->lpri);
         free(part);
         return EOK;
@@ -694 +718 @@
 
         part->label = label;
-        list_append(&part->llabel, &label->parts);
+        list_append(&part->lparts, &label->parts);
+        list_append(&part->lpri, &label->pri_parts);
         return EOK;
 }