Changeset 6bc542b in mainline for uspace/srv/bd/vbd/disk.c

Timestamp:

2015-07-02T21:53:12Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99c23405

Parents:

6a0d4ce2

Message:

Allocate and create partition with libfdisk (except actual modification of on-disk label).

File:

• uspace/srv/bd/vbd/disk.c (modified) (7 diffs)

uspace/srv/bd/vbd/disk.c

@@ -112 +112 @@
 }
 
-static int vbds_part_add(vbds_disk_t *disk, label_part_t *lpart)
+static int vbds_part_add(vbds_disk_t *disk, label_part_t *lpart,
+    vbds_part_t **rpart)
 {
         vbds_part_t *part;
@@ -163 +164 @@
         list_append(&part->lparts, &vbds_parts);
 
+        if (rpart != NULL)
+                *rpart = part;
         return EOK;
 }
@@ -230 +233 @@
         part = label_part_first(label);
         while (part != NULL) {
-                rc = vbds_part_add(disk, part);
+                rc = vbds_part_add(disk, part, NULL);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding partitio "
@@ -389 +392 @@
 }
 
-int vbds_part_create(service_id_t sid, vbds_part_id_t *rpart)
+int vbds_part_create(service_id_t sid, vbd_part_spec_t *pspec,
+    vbds_part_id_t *rpart)
 {
         vbds_disk_t *disk;
         vbds_part_t *part;
-        label_part_spec_t pspec;
+        label_part_spec_t lpspec;
         label_part_t *lpart;
         int rc;
-
-        part = calloc(1, sizeof(vbds_part_t));
-        if (part == NULL)
-                return ENOMEM;
 
         rc = vbds_disk_by_svcid(sid, &disk);
@@ -408 +408 @@
         }
 
-        label_pspec_init(&pspec);
-        rc = label_part_create(disk->label, &pspec, &lpart);
+        label_pspec_init(&lpspec);
+        lpspec.index = pspec->index;
+        lpspec.block0 = pspec->block0;
+        lpspec.nblocks = pspec->nblocks;
+        lpspec.ptype = pspec->ptype;
+
+        rc = label_part_create(disk->label, &lpspec, &lpart);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Error creating partition.");
@@ -415 +420 @@
         }
 
-        rc = vbds_part_add(disk, lpart);
+        rc = vbds_part_add(disk, lpart, &part);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed while creating "
@@ -427 +432 @@
         }
 
+        if (rpart != NULL)
+                *rpart = part->id;
         return EOK;
 error:
-        free(part);
         return rc;
 }