Changeset ff8c87c in mainline

Timestamp:

2013-07-24T22:51:59Z (11 years ago)

Author:

Ji?? Z?rev?cky <zarevucky.jiri@…>

Branches:

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

Children:

0ed9cb6

Parents:

9b48c06

Message:

Remove VFS_IN_OPEN from the server and fix trace.

Location:

uspace

Files:

• app/trace/trace.c (modified) (2 diffs)
• lib/c/include/ipc/vfs.h (modified) (1 diff)
• srv/vfs/vfs.c (modified) (1 diff)
• srv/vfs/vfs.h (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (1 diff)

uspace/app/trace/trace.c

@@ -696 +696 @@
 
         p = proto_new("vfs");
-        o = oper_new("open", 2, arg_def, V_INT_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_OPEN, o);
         o = oper_new("read", 1, arg_def, V_ERRNO, 1, resp_def);
         proto_add_oper(p, VFS_IN_READ, o);
@@ -724 +722 @@
         o = oper_new("stat", 0, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_STAT, o);
+        o = oper_new("walk", 3, arg_def, V_INT_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_WALK, o);
+        o = oper_new("open2", 2, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_OPEN2, o);
 
         proto_register(SERVICE_VFS, p);

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

@@ -63 +63 @@
 
 typedef enum {
-        VFS_IN_OPEN = IPC_FIRST_USER_METHOD,
-        VFS_IN_READ,
+        VFS_IN_READ = IPC_FIRST_USER_METHOD,
         VFS_IN_WRITE,
         VFS_IN_SEEK,

uspace/srv/vfs/vfs.c

@@ -91 +91 @@
                         vfs_open2(callid, &call);
                         break;
-                case VFS_IN_OPEN:
-                        vfs_open(callid, &call);
-                        break;
                 case VFS_IN_CLOSE:
                         vfs_close(callid, &call);

uspace/srv/vfs/vfs.h

@@ -211 +211 @@
 extern void vfs_mount(ipc_callid_t, ipc_call_t *);
 extern void vfs_unmount(ipc_callid_t, ipc_call_t *);
-extern void vfs_open(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_ops.c

@@ -738 +738 @@
 }
 
-void vfs_open(ipc_callid_t rid, ipc_call_t *request)
-{
-        /*
-         * The POSIX interface is open(path, oflag, mode).
-         * We can receive oflags and mode along with the VFS_IN_OPEN call;
-         * the path will need to arrive in another call.
-         *
-         * We also receive one private, non-POSIX set of flags called lflag
-         * used to pass information to vfs_lookup_internal().
-         */
-        int lflag = IPC_GET_ARG1(*request);
-        int oflag = IPC_GET_ARG2(*request);
-        int mode = IPC_GET_ARG3(*request);
-
-        /* Ignore mode for now. */
-        (void) mode;
-        
-        /*
-         * Make sure that we are called with exactly one of L_FILE and
-         * L_DIRECTORY. Make sure that the user does not pass L_OPEN,
-         * L_ROOT or L_MP.
-         */
-        if (((lflag & (L_FILE | L_DIRECTORY)) == 0) ||
-            ((lflag & (L_FILE | L_DIRECTORY)) == (L_FILE | L_DIRECTORY)) ||
-            (lflag & (L_OPEN | L_ROOT | L_MP))) {
-                async_answer_0(rid, EINVAL);
-                return;
-        }
-        
-        if ((((oflag & O_RDONLY) != 0) + ((oflag & O_WRONLY) != 0) + ((oflag & O_RDWR) != 0)) != 1) {
-                async_answer_0(rid, EINVAL);
-                return;
-        }
-        
-        if (oflag & O_CREAT)
-                lflag |= L_CREATE;
-        if (oflag & O_EXCL)
-                lflag |= L_EXCLUSIVE;
-        
-        char *path;
-        int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL);
-        if (rc != EOK) {
-                async_answer_0(rid, rc);
-                return;
-        }
-        
-        /*
-         * Avoid the race condition in which the file can be deleted before we
-         * find/create-and-lock the VFS node corresponding to the looked-up
-         * triplet.
-         */
-        if (lflag & L_CREATE)
-                fibril_rwlock_write_lock(&namespace_rwlock);
-        else
-                fibril_rwlock_read_lock(&namespace_rwlock);
-        
-        /* The path is now populated and we can call vfs_lookup_internal(). */
-        vfs_lookup_res_t lr;
-        rc = vfs_lookup_internal(path, lflag | L_OPEN, &lr, NULL);
-        if (rc != EOK) {
-                if (lflag & L_CREATE)
-                        fibril_rwlock_write_unlock(&namespace_rwlock);
-                else
-                        fibril_rwlock_read_unlock(&namespace_rwlock);
-                async_answer_0(rid, rc);
-                free(path);
-                return;
-        }
-        
-        /* Path is no longer needed. */
-        free(path);
-        
-        vfs_node_t *node = vfs_node_get(&lr);
-        if (lflag & L_CREATE)
-                fibril_rwlock_write_unlock(&namespace_rwlock);
-        else
-                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->service_id, 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);
-        
-        /* FIXME: There is a potential race with another fibril of a malicious client. */
-        assert(file);
-        
-        file->node = node;
-        if (oflag & O_RDONLY)
-                file->open_read = true;
-        if (oflag & O_WRONLY)
-                file->open_write = true;
-        if (oflag & O_RDWR)
-                file->open_read = file->open_write = true;
-        if (oflag & O_APPEND)
-                file->append = true;
-        assert(file->open_read || file->open_write);
-        
-        /*
-         * 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)
 {