Changeset b33ec43 in mainline for uspace/lib

Timestamp:

2011-08-18T12:10:23Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

27b76ca

Parents:

7171760

Message:

Remove support for directly opening nodes from VFS and libfs.

Location:

uspace/lib

Files:

• c/include/ipc/vfs.h (modified) (2 diffs)
• fs/libfs.c (modified) (4 diffs)

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

@@ -62 +62 @@
 typedef enum {
         VFS_IN_OPEN = IPC_FIRST_USER_METHOD,
-        VFS_IN_OPEN_NODE,
         VFS_IN_READ,
         VFS_IN_WRITE,
@@ -82 +81 @@
 
 typedef enum {
-        VFS_OUT_OPEN_NODE = IPC_FIRST_USER_METHOD,
-        VFS_OUT_READ,
+        VFS_OUT_READ = IPC_FIRST_USER_METHOD,
         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)
@@ -198 +196 @@
 }
 
-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)
 {
@@ -267 +260 @@
                 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:
@@ -845 +835 @@
 }
 
-/** 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);
-}
-
 /** @}
  */