Changeset 55a7fee in mainline

Timestamp:

2017-03-19T20:15:55Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3648e184

Parents:

35e81e2

Message:

Streamline vfs_op_fstat()

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (1 diff)
• vfs_ipc.c (modified) (1 diff)
• vfs_ops.c (modified) (2 diffs)

uspace/srv/vfs/vfs.h

@@ -212 +212 @@
 extern int vfs_op_close(int fd);
 extern int vfs_op_dup(int oldfd, int newfd);
-extern int vfs_op_fstat_forward(int fd);
+extern int vfs_op_fstat(int fd);
 extern int vfs_op_mount(int mpfd, unsigned servid, unsigned flags, unsigned instance, const char *opts, const char *fsname, int *outfd);
 extern int vfs_op_mtab_get(void);

uspace/srv/vfs/vfs_ipc.c

@@ -61 +61 @@
 {
         int fd = IPC_GET_ARG1(*request);
-        int rc = vfs_op_fstat_forward(fd);
+        int rc = vfs_op_fstat(fd);
         async_answer_0(rid, rc);
 }

uspace/srv/vfs/vfs_ops.c

@@ -137 +137 @@
 }
 
-int vfs_op_fstat_forward(int fd)
+int vfs_op_fstat(int fd)
 {
         vfs_file_t *file = vfs_file_get(fd);
@@ -143 +143 @@
                 return EBADF;
 
-        assert(file->node);
-        
-        ipc_callid_t callid;
-        if (!async_data_read_receive(&callid, NULL)) {
-                vfs_file_put(file);
-                async_answer_0(callid, EINVAL);
-                return EINVAL;
-        }
-
-        async_exch_t *exch = vfs_exchange_grab(file->node->fs_handle);
-        assert(exch);
-        
-        aid_t msg;
-        msg = async_send_3(exch, VFS_OUT_STAT, file->node->service_id,
-            file->node->index, true, NULL);
-        assert(msg);
-        async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
-        
+        vfs_node_t *node = file->node;
+
+        async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
+        int rc = async_data_read_forward_fast(exch, VFS_OUT_STAT,
+            node->service_id, node->index, true, 0, NULL);
         vfs_exchange_release(exch);
-        
-        sysarg_t rc;
-        async_wait_for(msg, &rc);
         
         vfs_file_put(file);