Changeset b4cbef1 in mainline for uspace/lib/libfs/libfs.c

Timestamp:

2010-02-03T16:52:37Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3b3e776, eda925a

Parents:

472c09d

Message:

add minimal data size check into async_data_receive
introduce more convenience wrappers for common IPC patterns:

async_data_read_forward_fast
async_data_void
async_data_forward_fast

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);
-                ipc_answer_0(callid, combine_rc(res, ENOENT));
+                async_data_void(combine_rc(res, ENOENT));
                 ipc_answer_0(rid, combine_rc(res, ENOENT));
                 return;
@@ -192 +184 @@
                 ipc_hangup(mountee_phone);
                 (void) ops->node_put(fn);
-                ipc_answer_0(callid, EBUSY);
+                async_data_void(EBUSY);
                 ipc_answer_0(rid, EBUSY);
                 return;
@@ -201 +193 @@
                 ipc_hangup(mountee_phone);
                 (void) ops->node_put(fn);
-                ipc_answer_0(callid, rc);
+                async_data_void(rc);
                 ipc_answer_0(rid, rc);
                 return;
@@ -207 +199 @@
         
         ipc_call_t answer;
-        aid_t msg = async_send_1(mountee_phone, VFS_OUT_MOUNTED, mr_dev_handle,
+        rc = async_data_forward_1_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) {