Changeset 28ed0d9 in mainline for uspace/lib/fdisk/src/fdisk.c

Timestamp:

2015-06-27T19:50:12Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

78d50bd

Parents:

22fb7ab

Message:

VBD client API, liblabel API, pass partition creation/deletion through to VBD.

File:

• uspace/lib/fdisk/src/fdisk.c (modified) (5 diffs)

uspace/lib/fdisk/src/fdisk.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <str.h>
+#include <vbd.h>
 #include <vol.h>
 
@@ -71 +72 @@
 int fdisk_create(fdisk_t **rfdisk)
 {
-        fdisk_t *fdisk;
+        fdisk_t *fdisk = NULL;
         int rc;
 
         fdisk = calloc(1, sizeof(fdisk_t));
-        if (fdisk == NULL)
-                return ENOMEM;
+        if (fdisk == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
 
         rc = vol_create(&fdisk->vol);
         if (rc != EOK) {
-                free(fdisk);
-                return EIO;
+                rc = EIO;
+                goto error;
+        }
+
+        rc = vbd_create(&fdisk->vbd);
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
         }
 
         *rfdisk = fdisk;
         return EOK;
+error:
+        fdisk_destroy(fdisk);
+
+        return rc;
 }
 
 void fdisk_destroy(fdisk_t *fdisk)
 {
+        if (fdisk == NULL)
+                return;
+
         vol_destroy(fdisk->vol);
+        vbd_destroy(fdisk->vbd);
         free(fdisk);
 }
@@ -368 +385 @@
 {
         fdisk_part_t *part;
+        vbd_part_spec_t vpspec;
+        vbd_part_id_t partid;
+        int rc;
 
         part = calloc(1, sizeof(fdisk_part_t));
         if (part == NULL)
                 return ENOMEM;
+
+        rc = vbd_part_create(dev->fdisk->vbd, dev->sid, &vpspec, &partid);
+        if (rc != EOK) {
+                free(part);
+                return EIO;
+        }
 
         part->dev = dev;
@@ -377 +403 @@
         part->capacity = pspec->capacity;
         part->fstype = pspec->fstype;
+        part->part_id = partid;
 
         if (rpart != NULL)
@@ -385 +412 @@
 int fdisk_part_destroy(fdisk_part_t *part)
 {
+        int rc;
+
+        rc = vbd_part_delete(part->dev->fdisk->vbd, part->part_id);
+        if (rc != EOK)
+                return EIO;
+
         list_remove(&part->ldev);
         free(part);