Changeset b33ec43 in mainline

Timestamp:

2011-08-18T12:10:23Z (13 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

Files:

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

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);
-}
-
 /** @}
  */

uspace/srv/vfs/vfs.c

@@ -83 +83 @@
                         vfs_open(callid, &call);
                         break;
-                case VFS_IN_OPEN_NODE:
-                        vfs_open_node(callid, &call);
-                        break;
                 case VFS_IN_CLOSE:
                         vfs_close(callid, &call);

uspace/srv/vfs/vfs.h

@@ -175 +175 @@
 extern int vfs_lookup_internal(char *, int, vfs_lookup_res_t *,
     vfs_pair_t *, ...);
-extern int vfs_open_node_internal(vfs_lookup_res_t *);
 
 extern bool vfs_nodes_init(void);
@@ -204 +203 @@
 extern void vfs_unmount(ipc_callid_t, ipc_call_t *);
 extern void vfs_open(ipc_callid_t, ipc_call_t *);
-extern void vfs_open_node(ipc_callid_t, ipc_call_t *);
 extern void vfs_sync(ipc_callid_t, ipc_call_t *);
 extern void vfs_dup(ipc_callid_t, ipc_call_t *);

uspace/srv/vfs/vfs_lookup.c

@@ -201 +201 @@
 }
 
-/** Perform a node open operation.
- *
- * @return EOK on success or an error code from errno.h.
- *
- */
-int vfs_open_node_internal(vfs_lookup_res_t *result)
-{
-        async_exch_t *exch = vfs_exchange_grab(result->triplet.fs_handle);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_2(exch, VFS_OUT_OPEN_NODE,
-            (sysarg_t) result->triplet.devmap_handle,
-            (sysarg_t) result->triplet.index, &answer);
-        
-        sysarg_t rc;
-        async_wait_for(req, &rc);
-        vfs_exchange_release(exch);
-        
-        if (rc == EOK) {
-                result->size =
-                    MERGE_LOUP32(IPC_GET_ARG1(answer), IPC_GET_ARG2(answer));
-                result->lnkcnt = (unsigned int) IPC_GET_ARG3(answer);
-                if (IPC_GET_ARG4(answer) & L_FILE)
-                        result->type = VFS_NODE_FILE;
-                else if (IPC_GET_ARG4(answer) & L_DIRECTORY)
-                        result->type = VFS_NODE_DIRECTORY;
-                else
-                        result->type = VFS_NODE_UNKNOWN;
-        }
-        
-        return rc;
-}
-
 /**
  * @}

uspace/srv/vfs/vfs_ops.c

@@ -618 +618 @@
 }
 
-void vfs_open_node(ipc_callid_t rid, ipc_call_t *request)
-{
-        // FIXME: check for sanity of the supplied fs, dev and index
-        
-        /*
-         * The interface is open_node(fs, dev, index, oflag).
-         */
-        vfs_lookup_res_t lr;
-        
-        lr.triplet.fs_handle = IPC_GET_ARG1(*request);
-        lr.triplet.devmap_handle = IPC_GET_ARG2(*request);
-        lr.triplet.index = IPC_GET_ARG3(*request);
-        int oflag = IPC_GET_ARG4(*request);
-        
-        fibril_rwlock_read_lock(&namespace_rwlock);
-        
-        int rc = vfs_open_node_internal(&lr);
-        if (rc != EOK) {
-                fibril_rwlock_read_unlock(&namespace_rwlock);
-                async_answer_0(rid, rc);
-                return;
-        }
-        
-        vfs_node_t *node = vfs_node_get(&lr);
-        fibril_rwlock_read_unlock(&namespace_rwlock);
-        
-        /* Truncate the file if requested and if necessary. */
-        if (oflag & O_TRUNC) {
-                fibril_rwlock_write_lock(&node->contents_rwlock);
-                if (node->size) {
-                        rc = vfs_truncate_internal(node->fs_handle,
-                            node->devmap_handle, node->index, 0);
-                        if (rc) {
-                                fibril_rwlock_write_unlock(&node->contents_rwlock);
-                                vfs_node_put(node);
-                                async_answer_0(rid, rc);
-                                return;
-                        }
-                        node->size = 0;
-                }
-                fibril_rwlock_write_unlock(&node->contents_rwlock);
-        }
-        
-        /*
-         * Get ourselves a file descriptor and the corresponding vfs_file_t
-         * structure.
-         */
-        int fd = vfs_fd_alloc((oflag & O_DESC) != 0);
-        if (fd < 0) {
-                vfs_node_put(node);
-                async_answer_0(rid, fd);
-                return;
-        }
-        vfs_file_t *file = vfs_file_get(fd);
-        file->node = node;
-        if (oflag & O_APPEND)
-                file->append = true;
-        
-        /*
-         * The following increase in reference count is for the fact that the
-         * file is being opened and that a file structure is pointing to it.
-         * It is necessary so that the file will not disappear when
-         * vfs_node_put() is called. The reference will be dropped by the
-         * respective VFS_IN_CLOSE.
-         */
-        vfs_node_addref(node);
-        vfs_node_put(node);
-        vfs_file_put(file);
-        
-        /* Success! Return the new file descriptor to the client. */
-        async_answer_1(rid, EOK, fd);
-}
-
 void vfs_sync(ipc_callid_t rid, ipc_call_t *request)
 {