Changeset 921b84f in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2011-08-19T17:36:25Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

5fb32c5

Parents:

ea186c6 (diff), f00af83 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix changes.

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (5 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -69 +69 @@
  *
  */
-static async_exch_t *vfs_exchange_begin(void)
+async_exch_t *vfs_exchange_begin(void)
 {
         fibril_mutex_lock(&vfs_mutex);
@@ -87 +87 @@
  *
  */
-static void vfs_exchange_end(async_exch_t *exch)
+void vfs_exchange_end(async_exch_t *exch)
 {
         async_exchange_end(exch);
@@ -329 +329 @@
 }
 
-int open_node(fdi_node_t *node, int oflag)
-{
-        async_exch_t *exch = vfs_exchange_begin();
-        
-        ipc_call_t answer;
-        aid_t req = async_send_4(exch, VFS_IN_OPEN_NODE, node->fs_handle,
-            node->service_id, node->index, oflag, &answer);
-        
-        vfs_exchange_end(exch);
-
-        sysarg_t rc;
-        async_wait_for(req, &rc);
-        
-        if (rc != EOK)
-                return (int) rc;
-        
-        return (int) IPC_GET_ARG1(answer);
-}
-
 int close(int fildes)
 {
@@ -819 +800 @@
 }
 
-int fd_node(int fildes, fdi_node_t *node)
-{
-        struct stat stat;
-        int rc = fstat(fildes, &stat);
-        
-        if (rc == EOK) {
-                node->fs_handle = stat.fs_handle;
-                node->service_id = stat.service_id;
-                node->index = stat.index;
-        }
-        
-        return rc;
-}
-
 int dup2(int oldfd, int newfd)
 {
@@ -848 +815 @@
 }
 
+int fd_wait(void)
+{
+        async_exch_t *exch = vfs_exchange_begin();
+        
+        sysarg_t ret;
+        sysarg_t rc = async_req_0_1(exch, VFS_IN_WAIT_HANDLE, &ret);
+        
+        vfs_exchange_end(exch);
+        
+        if (rc == EOK)
+                return (int) ret;
+        
+        return (int) rc;
+}
+
 /** @}
  */