Changeset 6bc542b in mainline for uspace/srv

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).

Location:

uspace/srv/bd/vbd

Files:

• disk.c (modified) (7 diffs)
• disk.h (modified) (1 diff)
• vbd.c (modified) (6 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;
 }

uspace/srv/bd/vbd/disk.h

@@ -50 +50 @@
 extern int vbds_label_delete(service_id_t);
 extern int vbds_part_get_info(vbds_part_id_t, vbd_part_info_t *);
-extern int vbds_part_create(service_id_t, vbds_part_id_t *);
+extern int vbds_part_create(service_id_t, vbd_part_spec_t *,vbds_part_id_t *);
 extern int vbds_part_delete(vbds_part_id_t);
 extern void vbds_bd_conn(ipc_callid_t, ipc_call_t *, void *);

uspace/srv/bd/vbd/vbd.c

@@ -115 +115 @@
         rc = vbds_disk_info(disk_sid, &dinfo);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() call failed");
-                async_answer_0(iid, rc);
-                return;
-        }
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() data_read_receive");
+                async_answer_0(iid, rc);
+                return;
+        }
+
         ipc_callid_t callid;
         size_t size;
         if (!async_data_read_receive(&callid, &size)) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() failed");
                 async_answer_0(callid, EREFUSED);
                 async_answer_0(iid, EREFUSED);
@@ -130 +127 @@
         }
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() check size");
         if (size != sizeof(vbds_disk_info_t)) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() wrong size");
                 async_answer_0(callid, EINVAL);
                 async_answer_0(iid, EINVAL);
@@ -138 +133 @@
         }
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() data_read_finalize");
         rc = async_data_read_finalize(callid, &dinfo,
             min(size, sizeof(dinfo)));
@@ -147 +141 @@
         }
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_disk_info() reply EOK");
         async_answer_0(iid, EOK);
 }
@@ -234 +227 @@
 {
         service_id_t disk_sid;
+        vbd_part_spec_t pspec;
         vbds_part_id_t part;
         int rc;
@@ -240 +234 @@
 
         disk_sid = IPC_GET_ARG1(*icall);
-        rc = vbds_part_create(disk_sid, &part);
+
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_write_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+
+        if (size != sizeof(vbd_part_spec_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+
+        rc = async_data_write_finalize(callid, &pspec, sizeof(vbd_part_spec_t));
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        rc = vbds_part_create(disk_sid, &pspec, &part);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+
         async_answer_1(iid, (sysarg_t)rc, (sysarg_t)part);
 }