Changeset b7a4d06 in mainline for uspace/srv/volsrv

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/volsrv

Files:

• disk.c (modified) (2 diffs)
• disk.h (modified) (2 diffs)
• volsrv.c (modified) (4 diffs)

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