Changeset b4cbef1 in mainline for uspace/srv/vfs/vfs_ops.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/srv/vfs/vfs_ops.c (modified) (2 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -794 +794 @@
         
         /*
-         * Now we need to receive a call with client's
-         * IPC_M_DATA_READ/IPC_M_DATA_WRITE request.
-         */
-        ipc_callid_t callid;
-        int res;
-        if (read)
-                res = async_data_read_receive(&callid, NULL);
-        else 
-                res = async_data_write_receive(&callid, NULL);
-        if (!res) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-        
-        /*
          * Lock the open file structure so that no other thread can manipulate
          * the same open file at a time.
@@ -833 +817 @@
         }
         
-        int fs_phone = vfs_grab_phone(file->node->fs_handle);   
-        
-        /* Make a VFS_READ/VFS_WRITE request at the destination FS server. */
-        aid_t msg;
-        ipc_call_t answer;
-        if (!read && file->append)
-                file->pos = file->node->size;
-        msg = async_send_3(fs_phone, read ? VFS_OUT_READ : VFS_OUT_WRITE,
-            file->node->dev_handle, file->node->index, file->pos, &answer);
-        
-        /*
-         * Forward the IPC_M_DATA_READ/IPC_M_DATA_WRITE request to the
+        int fs_phone = vfs_grab_phone(file->node->fs_handle);
+        
+        /*
+         * Make a VFS_READ/VFS_WRITE request at the destination FS server
+         * and forward the IPC_M_DATA_READ/IPC_M_DATA_WRITE request to the
          * destination FS server. The call will be routed as if sent by
          * ourselves. Note that call arguments are immutable in this case so we
          * don't have to bother.
          */
-        ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
-
-        /* Wait for reply from the FS server. */
         ipcarg_t rc;
-        async_wait_for(msg, &rc);
+        ipc_call_t answer;
+        if (read) {
+                if (file->append)
+                        file->pos = file->node->size;
+                
+                rc = async_data_read_forward_3_1(fs_phone, VFS_OUT_READ,
+                    file->node->dev_handle, file->node->index, file->pos,
+                    &answer);
+        } else {
+                rc = async_data_forward_3_1(fs_phone, VFS_OUT_WRITE,
+                    file->node->dev_handle, file->node->index, file->pos,
+                    &answer);
+        }
         
         vfs_release_phone(fs_phone);
         
         size_t bytes = IPC_GET_ARG1(answer);
-
+        
         if (file->node->type == VFS_NODE_DIRECTORY)
                 fibril_rwlock_read_unlock(&namespace_rwlock);