Changes in uspace/lib/libfs/libfs.c [eda925a:c888102] in mainline

File:

• uspace/lib/libfs/libfs.c (modified) (5 diffs)

uspace/lib/libfs/libfs.c

@@ -161 +161 @@
         /* Accept the phone */
         callid = async_get_call(&call);
-        int mountee_phone = (int) IPC_GET_ARG1(call);
+        int mountee_phone = (int)IPC_GET_ARG1(call);
         if ((IPC_GET_METHOD(call) != IPC_M_CONNECTION_CLONE) ||
             (mountee_phone < 0)) {
@@ -172 +172 @@
         ipc_answer_0(callid, EOK);
         
+        res = async_data_write_receive(&callid, NULL);
+        if (!res) {
+                ipc_hangup(mountee_phone);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+        
         fs_node_t *fn;
         res = ops->node_get(&fn, mp_dev_handle, mp_fs_index);
         if ((res != EOK) || (!fn)) {
                 ipc_hangup(mountee_phone);
-                async_data_write_void(combine_rc(res, ENOENT));
+                ipc_answer_0(callid, combine_rc(res, ENOENT));
                 ipc_answer_0(rid, combine_rc(res, ENOENT));
                 return;
@@ -184 +192 @@
                 ipc_hangup(mountee_phone);
                 (void) ops->node_put(fn);
-                async_data_write_void(EBUSY);
+                ipc_answer_0(callid, EBUSY);
                 ipc_answer_0(rid, EBUSY);
                 return;
@@ -193 +201 @@
                 ipc_hangup(mountee_phone);
                 (void) ops->node_put(fn);
-                async_data_write_void(rc);
+                ipc_answer_0(callid, rc);
                 ipc_answer_0(rid, rc);
                 return;
@@ -199 +207 @@
         
         ipc_call_t answer;
-        rc = async_data_write_forward_1_1(mountee_phone, VFS_OUT_MOUNTED,
-            mr_dev_handle, &answer);
+        aid_t msg = async_send_1(mountee_phone, VFS_OUT_MOUNTED, mr_dev_handle,
+            &answer);
+        ipc_forward_fast(callid, mountee_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+        async_wait_for(msg, &rc);
         
         if (rc == EOK) {