Changeset 372df8f in mainline for uspace/srv/volsrv

Timestamp:

2015-10-09T07:00:23Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0ecfc62

Parents:

0bde8523

Message:

Let VBD handle unlabeled devices too. Now volsrv only cares about partitions.

Location:

uspace/srv/volsrv

Files:

• Makefile (modified) (1 diff)
• disk.c (deleted)
• part.c (added)
• part.h (moved) (moved from uspace/srv/volsrv/disk.h ) (1 diff)
• types/part.h (moved) (moved from uspace/srv/volsrv/types/disk.h ) (2 diffs)
• volsrv.c (modified) (9 diffs)

uspace/srv/volsrv/Makefile

@@ -31 +31 @@
 
 SOURCES = \
-        disk.c \
+        part.c \
         volsrv.c
 

uspace/srv/volsrv/part.h

@@ -35 +35 @@
  */
 
-#ifndef DISK_H_
-#define DISK_H_
+#ifndef PART_H_
+#define pART_H_
 
 #include <sys/types.h>
 #include <vol.h>
-#include "types/disk.h"
+#include "types/part.h"
 
-extern int vol_disk_init(void);
-extern int vol_disk_discovery_start(void);
-extern int vol_disk_get_ids(service_id_t *, size_t, size_t *);
-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_disk(vol_disk_t *);
-extern int vol_disk_get_info(vol_disk_t *, vol_disk_info_t *);
+extern int vol_part_init(void);
+extern int vol_part_discovery_start(void);
+extern int vol_part_get_ids(service_id_t *, size_t, size_t *);
+extern int vol_part_find_by_id(service_id_t, vol_part_t **);
+extern int vol_part_empty_part(vol_part_t *);
+extern int vol_part_get_info(vol_part_t *, vol_part_info_t *);
 
 #endif

uspace/srv/volsrv/types/part.h

@@ -35 +35 @@
  */
 
-#ifndef TYPES_DISK_H_
-#define TYPES_DISK_H_
+#ifndef TYPES_PART_H_
+#define TYPES_PART_H_
 
 #include <types/label.h>
 
-/** Disk */
+/** Partition */
 typedef struct {
-        /** Link to vol_disks */
-        link_t ldisks;
+        /** Link to vol_parts */
+        link_t lparts;
         /** Service ID */
         service_id_t svc_id;
@@ -52 +52 @@
         /** Label type */
         label_type_t ltype;
-} vol_disk_t;
+} vol_part_t;
 
 #endif

uspace/srv/volsrv/volsrv.c

@@ -45 +45 @@
 #include <vol.h>
 
-#include "disk.h"
+#include "part.h"
 
 #define NAME  "volsrv"
@@ -56 +56 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_init()");
 
-        rc = vol_disk_init();
+        rc = vol_part_init();
         if (rc != EOK)
                 return rc;
 
-        rc = vol_disk_discovery_start();
+        rc = vol_part_discovery_start();
         if (rc != EOK)
                 return rc;
@@ -82 +82 @@
 }
 
-static void vol_get_disks_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vol_get_parts_srv(ipc_callid_t iid, ipc_call_t *icall)
 {
         ipc_callid_t callid;
@@ -102 +102 @@
         }
 
-        rc = vol_disk_get_ids(id_buf, size, &act_size);
+        rc = vol_part_get_ids(id_buf, size, &act_size);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -115 +115 @@
 }
 
-static void vol_disk_info_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vol_part_info_srv(ipc_callid_t iid, ipc_call_t *icall)
 {
         service_id_t sid;
-        vol_disk_t *disk;
-        vol_disk_info_t dinfo;
+        vol_part_t *part;
+        vol_part_info_t pinfo;
         int rc;
 
         sid = IPC_GET_ARG1(*icall);
-        rc = vol_disk_find_by_id(sid, &disk);
+        rc = vol_part_find_by_id(sid, &part);
         if (rc != EOK) {
                 async_answer_0(iid, ENOENT);
@@ -129 +129 @@
         }
 
-        rc = vol_disk_get_info(disk, &dinfo);
+        rc = vol_part_get_info(part, &pinfo);
         if (rc != EOK) {
                 async_answer_0(iid, EIO);
@@ -135 +135 @@
         }
 
-        async_answer_3(iid, rc, dinfo.dcnt, dinfo.ltype, dinfo.flags);
-}
-
-static void vol_label_create_srv(ipc_callid_t iid, ipc_call_t *icall)
+        async_answer_3(iid, rc, pinfo.dcnt, pinfo.ltype, pinfo.flags);
+}
+
+static void vol_part_empty_srv(ipc_callid_t iid, ipc_call_t *icall)
 {
         service_id_t sid;
-        vol_disk_t *disk;
-        label_type_t ltype;
+        vol_part_t *part;
         int rc;
 
         sid = IPC_GET_ARG1(*icall);
-        ltype = IPC_GET_ARG2(*icall);
-
-        rc = vol_disk_find_by_id(sid, &disk);
+
+        rc = vol_part_find_by_id(sid, &part);
         if (rc != EOK) {
                 async_answer_0(iid, ENOENT);
@@ -154 +152 @@
         }
 
-        rc = vol_disk_label_create(disk, ltype);
-        if (rc != EOK) {
-                async_answer_0(iid, EIO);
-                return;
-        }
-
-        async_answer_0(iid, EOK);
-}
-
-static void vol_disk_empty_srv(ipc_callid_t iid, ipc_call_t *icall)
-{
-        service_id_t sid;
-        vol_disk_t *disk;
-        int rc;
-
-        sid = IPC_GET_ARG1(*icall);
-
-        rc = vol_disk_find_by_id(sid, &disk);
-        if (rc != EOK) {
-                async_answer_0(iid, ENOENT);
-                return;
-        }
-
-        rc = vol_disk_empty_disk(disk);
+        rc = vol_part_empty_part(part);
         if (rc != EOK) {
                 async_answer_0(iid, EIO);
@@ -205 +180 @@
 
                 switch (method) {
-                case VOL_GET_DISKS:
-                        vol_get_disks_srv(callid, &call);
+                case VOL_GET_PARTS:
+                        vol_get_parts_srv(callid, &call);
                         break;
-                case VOL_DISK_INFO:
-                        vol_disk_info_srv(callid, &call);
+                case VOL_PART_INFO:
+                        vol_part_info_srv(callid, &call);
                         break;
-                case VOL_LABEL_CREATE:
-                        vol_label_create_srv(callid, &call);
-                        break;
-                case VOL_DISK_EMPTY:
-                        vol_disk_empty_srv(callid, &call);
+                case VOL_PART_EMPTY:
+                        vol_part_empty_srv(callid, &call);
                         break;
                 default: