Changeset 0ecfc62 in mainline for uspace/srv/volsrv

Timestamp:

2015-10-09T18:11:08Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3a43785

Parents:

372df8f

Message:

Information structures need updating to new model.

Location:

uspace/srv/volsrv

Files:

• part.c (modified) (3 diffs)
• types/part.h (modified) (1 diff)
• volsrv.c (modified) (2 diffs)

uspace/srv/volsrv/part.c

@@ -113 +113 @@
 
         link_initialize(&part->lparts);
-        part->dcnt = dc_empty;
+        part->pcnt = vpc_empty;
 
         return part;
@@ -149 +149 @@
         log_msg(LOG_DEFAULT, LVL_NOTE, "Probe partition %s", part->svc_name);
 
-        part->dcnt = dc_unknown;
+        part->pcnt = vpc_unknown;
         list_append(&part->lparts, &vol_parts);
 
@@ -227 +227 @@
 int vol_part_empty_part(vol_part_t *part)
 {
-        part->dcnt = dc_empty;
-
-        return EOK;
-}
-
-int vol_part_get_info(vol_part_t *part, vol_part_info_t *dinfo)
-{
-        dinfo->dcnt = part->dcnt;
+        part->pcnt = vpc_empty;
+
+        return EOK;
+}
+
+int vol_part_get_info(vol_part_t *part, vol_part_info_t *pinfo)
+{
+        pinfo->pcnt = part->pcnt;
+        pinfo->fstype = part->fstype;
         return EOK;
 }

uspace/srv/volsrv/types/part.h

@@ -48 +48 @@
         /** Service name */
         char *svc_name;
-        /** Disk contents */
-        label_disk_cnt_t dcnt;
-        /** Label type */
-        label_type_t ltype;
+        /** Partition contents */
+        vol_part_cnt_t pcnt;
+        /** Filesystem type */
+        vol_fstype_t fstype;
 } vol_part_t;
 

uspace/srv/volsrv/volsrv.c

@@ -40 +40 @@
 #include <ipc/vol.h>
 #include <loc.h>
+#include <macros.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -135 +136 @@
         }
 
-        async_answer_3(iid, rc, pinfo.dcnt, pinfo.ltype, pinfo.flags);
+        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(vol_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);
 }