Changeset 44451ee in mainline

Timestamp:

2011-08-18T15:32:40Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

221ab41a

Parents:

27b76ca

Message:

Partially revert changes made in changeset jakub@….

• Undelete VFS_OUT_OPEN_NODE.
• Undelete libfs_open_node().
• Undelete vfs_open_node_internal(), simplify it and rename to vfs_open_node_remote().

Location:

uspace

Files:

• lib/c/include/ipc/vfs.h (modified) (1 diff)
• lib/fs/libfs.c (modified) (4 diffs)
• srv/vfs/vfs.h (modified) (1 diff)
• srv/vfs/vfs_node.c (modified) (1 diff)

uspace/lib/c/include/ipc/vfs.h

@@ -82 +82 @@
 
 typedef enum {
-        VFS_OUT_READ = IPC_FIRST_USER_METHOD,
+        VFS_OUT_OPEN_NODE = IPC_FIRST_USER_METHOD,
+        VFS_OUT_READ,
         VFS_OUT_WRITE,
         VFS_OUT_TRUNCATE,

uspace/lib/fs/libfs.c

@@ -72 +72 @@
     ipc_call_t *);
 static void libfs_stat(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
+static void libfs_open_node(libfs_ops_t *, fs_handle_t, ipc_callid_t,
+    ipc_call_t *);
 
 static void vfs_out_mounted(ipc_callid_t rid, ipc_call_t *req)
@@ -196 +198 @@
 }
 
+static void vfs_out_open_node(ipc_callid_t rid, ipc_call_t *req)
+{
+        libfs_open_node(libfs_ops, reg.fs_handle, rid, req);
+}
+
 static void vfs_out_stat(ipc_callid_t rid, ipc_call_t *req)
 {
@@ -260 +267 @@
                 case VFS_OUT_DESTROY:
                         vfs_out_destroy(callid, &call);
+                        break;
+                case VFS_OUT_OPEN_NODE:
+                        vfs_out_open_node(callid, &call);
                         break;
                 case VFS_OUT_STAT:
@@ -835 +845 @@
 }
 
+/** Open VFS triplet.
+ *
+ * @param ops     libfs operations structure with function pointers to
+ *                file system implementation
+ * @param rid     Request ID of the VFS_OUT_OPEN_NODE request.
+ * @param request VFS_OUT_OPEN_NODE request data itself.
+ *
+ */
+void libfs_open_node(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
+    ipc_call_t *request)
+{
+        devmap_handle_t devmap_handle = IPC_GET_ARG1(*request);
+        fs_index_t index = IPC_GET_ARG2(*request);
+        
+        fs_node_t *fn;
+        int rc = ops->node_get(&fn, devmap_handle, index);
+        on_error(rc, answer_and_return(rid, rc));
+        
+        if (fn == NULL) {
+                async_answer_0(rid, ENOENT);
+                return;
+        }
+        
+        rc = ops->node_open(fn);
+        aoff64_t size = ops->size_get(fn);
+        async_answer_4(rid, rc, LOWER32(size), UPPER32(size),
+            ops->lnkcnt_get(fn),
+            (ops->is_file(fn) ? L_FILE : 0) | (ops->is_directory(fn) ? L_DIRECTORY : 0));
+        
+        (void) ops->node_put(fn);
+}
+
 /** @}
  */

uspace/srv/vfs/vfs.h

@@ -199 +199 @@
 extern void vfs_node_addref(vfs_node_t *);
 extern void vfs_node_delref(vfs_node_t *);
+extern int vfs_open_node_remote(vfs_node_t *);
 
 extern void vfs_register(ipc_callid_t, ipc_call_t *);

uspace/srv/vfs/vfs_node.c

@@ -293 +293 @@
 }
 
+
+/** Perform a remote node open operation.
+ *
+ * @return EOK on success or an error code from errno.h.
+ *
+ */
+int vfs_open_node_remote(vfs_node_t *node)
+{
+        async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_2(exch, VFS_OUT_OPEN_NODE,
+            (sysarg_t) node->devmap_handle, (sysarg_t) node->index, &answer);
+        
+        vfs_exchange_release(exch);
+
+        sysarg_t rc;
+        async_wait_for(req, &rc);
+        
+        return rc;
+}
+
 /**
  * @}