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

Timestamp:

2015-07-02T19:01:37Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6a0d4ce2

Parents:

3faa03d

Message:

Propagate label and partition block ranges and other info up through the stack.

File:

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

uspace/lib/label/src/mbr.c

@@ -37 +37 @@
 #include <byteorder.h>
 #include <errno.h>
+#include <mem.h>
 #include <stdlib.h>
 
@@ -46 +47 @@
 static void mbr_close(label_t *);
 static int mbr_destroy(label_t *);
+static int mbr_get_info(label_t *, label_info_t *);
 static label_part_t *mbr_part_first(label_t *);
 static label_part_t *mbr_part_next(label_part_t *);
@@ -52 +54 @@
 static int mbr_part_destroy(label_part_t *);
 
-static int mbr_pte_to_part(label_t *, mbr_pte_t *);
+static int mbr_pte_to_part(label_t *, mbr_pte_t *, int);
 
 label_ops_t mbr_label_ops = {
@@ -59 +61 @@
         .close = mbr_close,
         .destroy = mbr_destroy,
+        .get_info = mbr_get_info,
         .part_first = mbr_part_first,
         .part_next = mbr_part_next,
@@ -73 +76 @@
         uint16_t sgn;
         size_t bsize;
+        aoff64_t nblocks;
         uint32_t entry;
         int rc;
@@ -82 +86 @@
         }
 
+        rc = block_get_nblocks(sid, &nblocks);
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
+        }
+
         if (bsize < 512 || (bsize % 512) != 0) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        if (nblocks < mbr_ablock0) {
                 rc = EINVAL;
                 goto error;
@@ -93 +108 @@
         }
 
-        rc = block_read_direct(sid, MBR_BA, 1, mbr);
+        rc = block_read_direct(sid, mbr_ba, 1, mbr);
         if (rc != EOK) {
                 rc = EIO;
@@ -114 +129 @@
         for (entry = 0; entry < mbr_nprimary; entry++) {
                 eptr = &mbr->pte[entry];
-                rc = mbr_pte_to_part(label, eptr);
+                rc = mbr_pte_to_part(label, eptr, entry + 1);
                 if (rc != EOK)
                         goto error;
@@ -124 +139 @@
         label->ops = &mbr_label_ops;
         label->ltype = lt_mbr;
+        label->ablock0 = mbr_ablock0;
+        label->anblocks = nblocks - mbr_ablock0;
         *rlabel = label;
         return EOK;
@@ -147 +164 @@
 }
 
+static int mbr_get_info(label_t *label, label_info_t *linfo)
+{
+        memset(linfo, 0, sizeof(label_info_t));
+        linfo->dcnt = dc_label;
+        linfo->ltype = lt_mbr;
+        linfo->ablock0 = label->ablock0;
+        linfo->anblocks = label->anblocks;
+        return EOK;
+}
+
 static label_part_t *mbr_part_first(label_t *label)
 {
@@ -171 +198 @@
 static void mbr_part_get_info(label_part_t *part, label_part_info_t *pinfo)
 {
+        pinfo->index = part->index;
         pinfo->block0 = part->block0;
         pinfo->nblocks = part->nblocks;
@@ -178 +206 @@
     label_part_t **rpart)
 {
-        return EOK;
+        return ENOTSUP;
 }
 
 static int mbr_part_destroy(label_part_t *part)
 {
-        return EOK;
-}
-
-static int mbr_pte_to_part(label_t *label, mbr_pte_t *pte)
+        return ENOTSUP;
+}
+
+static int mbr_pte_to_part(label_t *label, mbr_pte_t *pte, int index)
 {
         label_part_t *part;
@@ -204 +232 @@
                 return ENOMEM;
 
+        part->index = index;
         part->block0 = block0;
         part->nblocks = nblocks;