Changeset 78d50bd in mainline for uspace/lib/label

Timestamp:

2015-06-29T18:47:07Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3faa03d

Parents:

28ed0d9

Message:

Implement partition block device interface in VBD based on data from liblabel.

Location:

uspace/lib/label

Files:

• include/label.h (modified) (1 diff)
• include/types/liblabel.h (modified) (2 diffs)
• src/label.c (modified) (5 diffs)

uspace/lib/label/include/label.h

@@ -49 +49 @@
 extern label_part_t *label_part_first(label_t *);
 extern label_part_t *label_part_next(label_part_t *);
+extern void label_part_get_info(label_part_t *, label_part_info_t *);
 
 extern int label_part_create(label_t *, label_part_spec_t *,

uspace/lib/label/include/types/liblabel.h

@@ -39 +39 @@
 #include <adt/list.h>
 #include <types/label.h>
+#include <sys/types.h>
 #include <vol.h>
 
@@ -48 +49 @@
 } label_info_t;
 
+typedef struct {
+        /** Address of first block */
+        aoff64_t block0;
+        /** Number of blocks */
+        aoff64_t nblocks;
+} label_part_info_t;
+
 /** Partition */
 typedef struct {
         /** Containing label */
         struct label *label;
-        /** Link to fdisk_dev_t.parts */
-        link_t ldev;
-        /** Capacity */
-//      fdisk_cap_t capacity;
-        /** File system type */
-//      fdisk_fstype_t fstype;
+        /** Link to label_t.parts */
+        link_t llabel;
 } label_part_t;
 
 /** Specification of new partition */
 typedef struct {
-        /** Desired capacity */
-//      fdisk_cap_t capacity;
-        /** File system type */
-//      fdisk_fstype_t fstype;
 } label_part_spec_t;
 
 /** Label instance */
 typedef struct label {
+        /** Partitions */
+        list_t parts; /* of label_part_t */
 } label_t;
 

uspace/lib/label/src/label.c

@@ -34 +34 @@
  */
 
+#include <adt/list.h>
 #include <errno.h>
 #include <label.h>
@@ -47 +48 @@
                 return ENOMEM;
 
+        list_initialize(&label->parts);
         *rlabel = label;
         return EOK;
@@ -59 +61 @@
                 return ENOMEM;
 
+        list_initialize(&label->parts);
         *rlabel = label;
         return EOK;
@@ -65 +68 @@
 void label_close(label_t *label)
 {
+        if (label == NULL)
+                return;
+
         free(label);
 }
@@ -83 +89 @@
 label_part_t *label_part_first(label_t *label)
 {
-        return NULL;
+        link_t *link;
+
+        link = list_first(&label->parts);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, label_part_t, llabel);
 }
 
-label_part_t *label_part_next(label_part_t *oart)
+label_part_t *label_part_next(label_part_t *part)
 {
-        return NULL;
+        link_t *link;
+
+        link = list_next(&part->llabel, &part->label->parts);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, label_part_t, llabel);
 }
 
+void label_part_get_info(label_part_t *part, label_part_info_t *pinfo)
+{
+        pinfo->block0 = 0;
+        pinfo->nblocks = 0;
+}
 
 int label_part_create(label_t *label, label_part_spec_t *pspec,
     label_part_t **rpart)
 {
-        return ENOTSUP;
+        label_part_t *part;
+
+        part = calloc(1, sizeof(label_part_t));
+        if (part == NULL)
+                return ENOMEM;
+
+        part->label = label;
+        list_append(&part->llabel, &label->parts);
+        *rpart = part;
+        return EOK;
 }
 
 int label_part_destroy(label_part_t *part)
 {
+        list_remove(&part->llabel);
+        free(part);
         return EOK;
 }