Changes in uspace/srv/volsrv/volsrv.c [9c2c7d2:2dab624] in mainline

File:

• uspace/srv/volsrv/volsrv.c (modified) (7 diffs)

uspace/srv/volsrv/volsrv.c

@@ -46 +46 @@
 #include <types/vol.h>
 
-#include "mkfs.h"
 #include "part.h"
 
@@ -66 +65 @@
                 return rc;
 
-        async_set_fallback_port_handler(vol_client_conn, NULL);
+        async_set_client_connection(vol_client_conn);
 
         rc = loc_server_register(NAME);
@@ -132 +131 @@
         async_answer_0(iid, EOK);
 }
+
 
 static void vol_part_info_srv(ipc_callid_t iid, ipc_call_t *icall)
@@ -204 +204 @@
 }
 
-static void vol_part_get_lsupp_srv(ipc_callid_t iid, ipc_call_t *icall)
-{
-        vol_fstype_t fstype;
-        vol_label_supp_t vlsupp;
-        int rc;
-
-        fstype = IPC_GET_ARG1(*icall);
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_get_lsupp_srv(%u)",
-            fstype);
-
-        volsrv_part_get_lsupp(fstype, &vlsupp);
-
-        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_label_supp_t)) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(iid, EINVAL);
-                return;
-        }
-
-        rc = async_data_read_finalize(callid, &vlsupp,
-            min(size, sizeof(vlsupp)));
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-                async_answer_0(iid, rc);
-                return;
-        }
-
-        async_answer_0(iid, EOK);
-}
-
-
 static void vol_part_mkfs_srv(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -247 +209 @@
         vol_part_t *part;
         vol_fstype_t fstype;
-        char *label;
         int rc;
 
@@ -253 +214 @@
         fstype = IPC_GET_ARG2(*icall);
 
-        rc = async_data_write_accept((void **)&label, true, 0, VOL_LABEL_MAXLEN,
-            0, NULL);
-        if (rc != EOK) {
-                async_answer_0(iid, rc);
-                return;
-        }
-
-        printf("vol_part_mkfs_srv: label=%p\n", label);
-        if (label!=NULL) printf("vol_part_mkfs_srv: label='%s'\n", label);
-
         rc = vol_part_find_by_id(sid, &part);
         if (rc != EOK) {
-                free(label);
                 async_answer_0(iid, ENOENT);
                 return;
         }
 
-        rc = vol_part_mkfs_part(part, fstype, label);
-        if (rc != EOK) {
-                free(label);
-                async_answer_0(iid, rc);
-                return;
-        }
-
-        free(label);
+        rc = vol_part_mkfs_part(part, fstype);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        part->pcnt = vpc_fs;
+        part->fstype = fstype;
+
         async_answer_0(iid, EOK);
 }
@@ -312 +263 @@
                         vol_part_empty_srv(callid, &call);
                         break;
-                case VOL_PART_LSUPP:
-                        vol_part_get_lsupp_srv(callid, &call);
-                        break;
                 case VOL_PART_MKFS:
                         vol_part_mkfs_srv(callid, &call);