Changeset b7a4d06 in mainline for uspace/srv

Timestamp:

2015-07-18T12:55:12Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c43db5f

Parents:

70815a24

Message:

Most of extended (but not logical) partition support.

Location:

uspace/srv

Files:

• bd/vbd/disk.c (modified) (6 diffs)
• bd/vbd/disk.h (modified) (1 diff)
• bd/vbd/types/vbd.h (modified) (1 diff)
• bd/vbd/vbd.c (modified) (3 diffs)
• volsrv/disk.c (modified) (2 diffs)
• volsrv/disk.h (modified) (2 diffs)
• volsrv/volsrv.c (modified) (4 diffs)

uspace/srv/bd/vbd/disk.c

@@ -125 +125 @@
             disk->svc_name, lpart);
 
+        label_part_get_info(lpart, &lpinfo);
+
         part = calloc(1, sizeof(vbds_part_t));
         if (part == NULL) {
@@ -148 +150 @@
 
         free(name);
-        label_part_get_info(lpart, &lpinfo);
 
         part->lpart = lpart;
@@ -302 +303 @@
 }
 
-int vbds_disk_info(service_id_t sid, vbds_disk_info_t *info)
+int vbds_disk_info(service_id_t sid, vbd_disk_info_t *info)
 {
         vbds_disk_t *disk;
@@ -317 +318 @@
 
         info->ltype = linfo.ltype;
+        info->flags = linfo.flags;
         info->ablock0 = linfo.ablock0;
         info->anblocks = linfo.anblocks;
@@ -467 +469 @@
 
         pinfo->index = lpinfo.index;
+        pinfo->pkind = lpinfo.pkind;
         pinfo->block0 = lpinfo.block0;
         pinfo->nblocks = lpinfo.nblocks;
@@ -492 +495 @@
         lpspec.block0 = pspec->block0;
         lpspec.nblocks = pspec->nblocks;
+        lpspec.pkind = pspec->pkind;
         lpspec.ptype = pspec->ptype;
 

uspace/srv/bd/vbd/disk.h

@@ -45 +45 @@
 extern int vbds_disk_add(service_id_t);
 extern int vbds_disk_remove(service_id_t);
-extern int vbds_disk_info(service_id_t, vbds_disk_info_t *);
+extern int vbds_disk_info(service_id_t, vbd_disk_info_t *);
 extern int vbds_get_parts(service_id_t, service_id_t *, size_t, size_t *);
 extern int vbds_label_create(service_id_t, label_type_t);

uspace/srv/bd/vbd/types/vbd.h

@@ -47 +47 @@
 typedef sysarg_t vbds_part_id_t;
 
-/** Disk info */
-typedef struct {
-        /** Label type */
-        label_type_t ltype;
-        /** First block that can be allocated */
-        aoff64_t ablock0;
-        /** Number of blocks that can be allocated */
-        aoff64_t anblocks;
-        /** Block size */
-        size_t block_size;
-} vbds_disk_info_t;
-
 /** Partition */
 typedef struct {

uspace/srv/bd/vbd/vbd.c

@@ -107 +107 @@
 {
         service_id_t disk_sid;
-        vbds_disk_info_t dinfo;
+        vbd_disk_info_t dinfo;
         int rc;
 
@@ -127 +127 @@
         }
 
-        if (size != sizeof(vbds_disk_info_t)) {
+        if (size != sizeof(vbd_disk_info_t)) {
                 async_answer_0(callid, EINVAL);
                 async_answer_0(iid, EINVAL);
@@ -219 +219 @@
         part = IPC_GET_ARG1(*icall);
         rc = vbds_part_get_info(part, &pinfo);
-        async_answer_5(iid, (sysarg_t)rc, pinfo.index,
-            LOWER32(pinfo.block0), UPPER32(pinfo.block0),
-            LOWER32(pinfo.nblocks), UPPER32(pinfo.nblocks));
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+
+        if (size != sizeof(vbd_part_info_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+
+        rc = async_data_read_finalize(callid, &pinfo,
+            min(size, sizeof(pinfo)));
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        async_answer_0(iid, EOK);
 }
 

uspace/srv/volsrv/disk.c

@@ -271 +271 @@
 }
 
-int vol_disk_empty(vol_disk_t *disk)
+int vol_disk_empty_disk(vol_disk_t *disk)
 {
         int rc;
@@ -286 +286 @@
 }
 
+int vol_disk_get_info(vol_disk_t *disk, vol_disk_info_t *dinfo)
+{
+        vbd_disk_info_t vdinfo;
+        int rc;
+
+        dinfo->dcnt = disk->dcnt;
+
+        if (disk->dcnt == dc_label) {
+                rc = vbd_disk_info(vbd, disk->svc_id, &vdinfo);
+                if (rc != EOK)
+                        return rc;
+
+                dinfo->ltype = vdinfo.ltype;
+                dinfo->flags = vdinfo.flags;
+        }
+
+        return EOK;
+}
+
 
 /** @}

uspace/srv/volsrv/disk.h

@@ -39 +39 @@
 
 #include <sys/types.h>
+#include <vol.h>
 #include "types/disk.h"
 
@@ -46 +47 @@
 extern int vol_disk_find_by_id(service_id_t, vol_disk_t **);
 extern int vol_disk_label_create(vol_disk_t *, label_type_t);
-extern int vol_disk_empty(vol_disk_t *);
+extern int vol_disk_empty_disk(vol_disk_t *);
+extern int vol_disk_get_info(vol_disk_t *, vol_disk_info_t *);
 
 #endif

uspace/srv/volsrv/volsrv.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <task.h>
+#include <vol.h>
 
 #include "disk.h"
@@ -118 +119 @@
         service_id_t sid;
         vol_disk_t *disk;
+        vol_disk_info_t dinfo;
         int rc;
 
@@ -127 +129 @@
         }
 
-        async_answer_2(iid, rc, disk->dcnt, disk->ltype);
+        rc = vol_disk_get_info(disk, &dinfo);
+        if (rc != EOK) {
+                async_answer_0(iid, EIO);
+                return;
+        }
+
+        async_answer_3(iid, rc, dinfo.dcnt, dinfo.ltype, dinfo.flags);
 }
 
@@ -169 +177 @@
         }
 
-        rc = vol_disk_empty(disk);
+        rc = vol_disk_empty_disk(disk);
         if (rc != EOK) {
                 async_answer_0(iid, EIO);