Changes in uspace/lib/c/generic/vol.c [9c2c7d2:44fe800] in mainline

File:

• uspace/lib/c/generic/vol.c (modified) (4 diffs)

uspace/lib/c/generic/vol.c

@@ -33 +33 @@
  */
 
-#include <abi/ipc/interfaces.h>
 #include <errno.h>
 #include <ipc/services.h>
@@ -39 +38 @@
 #include <loc.h>
 #include <stdlib.h>
-#include <str.h>
 #include <vol.h>
 
@@ -62 +60 @@
         rc = loc_service_get_id(SERVICE_NAME_VOLSRV, &vol_svcid, 0);
         if (rc != EOK) {
-                rc = ENOENT;
+                rc = EIO;
                 goto error;
         }
 
-        vol->sess = loc_service_connect(vol_svcid, INTERFACE_VOL, 0);
+        vol->sess = loc_service_connect(EXCHANGE_SERIALIZE, vol_svcid, 0);
         if (vol->sess == NULL) {
                 rc = EIO;
@@ -252 +250 @@
 }
 
-/** Get volume label support. */
-int vol_part_get_lsupp(vol_t *vol, vol_fstype_t fstype,
-    vol_label_supp_t *vlsupp)
-{
-        async_exch_t *exch;
-        sysarg_t retval;
-        ipc_call_t answer;
-
-        exch = async_exchange_begin(vol->sess);
-        aid_t req = async_send_1(exch, VOL_PART_LSUPP, fstype, &answer);
-        int rc = async_data_read_start(exch, vlsupp, sizeof(vol_label_supp_t));
-        async_exchange_end(exch);
-
-        if (rc != EOK) {
-                async_forget(req);
-                return EIO;
-        }
-
-        async_wait_for(req, &retval);
-        if (retval != EOK)
-                return EIO;
-
-        return EOK;
-}
-
 /** Create file system. */
-int vol_part_mkfs(vol_t *vol, service_id_t sid, vol_fstype_t fstype,
-    const char *label)
-{
-        async_exch_t *exch;
-        ipc_call_t answer;
-        sysarg_t retval;
-
-        exch = async_exchange_begin(vol->sess);
-        aid_t req = async_send_2(exch, VOL_PART_MKFS, sid, fstype, &answer);
-        retval = async_data_write_start(exch, label, str_size(label));
-        async_exchange_end(exch);
-
-        if (retval != EOK) {
-                async_forget(req);
-                return retval;
-        }
-
-        async_wait_for(req, &retval);
+int vol_part_mkfs(vol_t *vol, service_id_t sid, vol_fstype_t fstype)
+{
+        async_exch_t *exch;
+        int retval;
+
+        exch = async_exchange_begin(vol->sess);
+        retval = async_req_2_0(exch, VOL_PART_MKFS, sid, fstype);
+        async_exchange_end(exch);
 
         if (retval != EOK)