Changes in uspace/srv/vfs/vfs_ops.c [b1956e3:6f2c1ff] in mainline

File:

• uspace/srv/vfs/vfs_ops.c (modified) (5 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -734 +734 @@
 }
 
-typedef int (* rdwr_ipc_cb_t)(async_exch_t *, vfs_file_t *, ipc_call_t *,
-    bool, void *);
-
-static int rdwr_ipc_client(async_exch_t *exch, vfs_file_t *file,
-    ipc_call_t *answer, bool read, void *data)
-{
-        size_t *bytes = (size_t *) data;
-        int rc;
-
-        /*
-         * 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.
-         */
-
-        if (read) {
-                rc = async_data_read_forward_4_1(exch, VFS_OUT_READ,
-                    file->node->service_id, file->node->index,
-                    LOWER32(file->pos), UPPER32(file->pos), answer);
-        } else {
-                rc = async_data_write_forward_4_1(exch, VFS_OUT_WRITE,
-                    file->node->service_id, file->node->index,
-                    LOWER32(file->pos), UPPER32(file->pos), answer);
-        }
-
-        *bytes = IPC_GET_ARG1(*answer);
-        return rc;
-}
-
-static int rdwr_ipc_internal(async_exch_t *exch, vfs_file_t *file,
-    ipc_call_t *answer, bool read, void *data)
-{
-        rdwr_io_chunk_t *chunk = (rdwr_io_chunk_t *) data;
-
-        if (exch == NULL)
-                return ENOENT;
-        
-        aid_t msg = async_send_fast(exch, read ? VFS_OUT_READ : VFS_OUT_WRITE,
-            file->node->service_id, file->node->index, LOWER32(file->pos),
-            UPPER32(file->pos), answer);
-        if (msg == 0)
-                return EINVAL;
-
-        int retval = async_data_read_start(exch, chunk->buffer, chunk->size);
-        if (retval != EOK) {
-                async_forget(msg);
-                return retval;
-        }
-        
-        sysarg_t rc;
-        async_wait_for(msg, &rc);
-        
-        chunk->size = IPC_GET_ARG1(*answer); 
-
-        return (int) rc;
-}
-
-static int vfs_rdwr(int fd, bool read, rdwr_ipc_cb_t ipc_cb, void *ipc_cb_data)
+static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read)
 {
         /*
@@ -805 +746 @@
          */
         
+        int fd = IPC_GET_ARG1(*request);
+        
         /* Lookup the file structure corresponding to the file descriptor. */
         vfs_file_t *file = vfs_file_get(fd);
-        if (!file)
-                return ENOENT;
+        if (!file) {
+                async_answer_0(rid, ENOENT);
+                return;
+        }
         
         /*
@@ -841 +786 @@
         async_exch_t *fs_exch = vfs_exchange_grab(file->node->fs_handle);
         
-        if (!read && file->append)
-                file->pos = file->node->size;
-        
-        /*
-         * Handle communication with the endpoint FS.
-         */
+        /*
+         * 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.
+         */
+        sysarg_t rc;
         ipc_call_t answer;
-        int rc = ipc_cb(fs_exch, file, &answer, read, ipc_cb_data);
+        if (read) {
+                rc = async_data_read_forward_4_1(fs_exch, VFS_OUT_READ,
+                    file->node->service_id, file->node->index,
+                    LOWER32(file->pos), UPPER32(file->pos), &answer);
+        } else {
+                if (file->append)
+                        file->pos = file->node->size;
+                
+                rc = async_data_write_forward_4_1(fs_exch, VFS_OUT_WRITE,
+                    file->node->service_id, file->node->index,
+                    LOWER32(file->pos), UPPER32(file->pos), &answer);
+        }
         
         vfs_exchange_release(fs_exch);
@@ -875 +833 @@
         vfs_file_put(file);     
 
-        return rc;
-}
-        
-static void vfs_rdwr_client(ipc_callid_t rid, ipc_call_t *request, bool read)
-{
-        size_t bytes = 0;       
-        int rc = vfs_rdwr(IPC_GET_ARG1(*request), read, rdwr_ipc_client,
-            &bytes);
+        /*
+         * FS server's reply is the final result of the whole operation we
+         * return to the client.
+         */
         async_answer_1(rid, rc, bytes);
 }
 
-int vfs_rdwr_internal(int fd, bool read, rdwr_io_chunk_t *chunk)
-{
-        return vfs_rdwr(fd, read, rdwr_ipc_internal, chunk);
-}
-
 void vfs_read(ipc_callid_t rid, ipc_call_t *request)
 {
-        vfs_rdwr_client(rid, request, true);
+        vfs_rdwr(rid, request, true);
 }
 
 void vfs_write(ipc_callid_t rid, ipc_call_t *request)
 {
-        vfs_rdwr_client(rid, request, false);
+        vfs_rdwr(rid, request, false);
 }
 
@@ -944 +893 @@
                 
                 file->pos += off;
-                newoff = (file->pos > OFF64_MAX) ? OFF64_MAX : file->pos;
+                newoff = (file->pos > OFF64_MAX) ?  OFF64_MAX : file->pos;
                 
                 fibril_mutex_unlock(&file->lock);