Changes in uspace/srv/vfs/vfs_file.c [fcab7ef:3e6a98c5] in mainline

File:

• uspace/srv/vfs/vfs_file.c (modified) (17 diffs)

uspace/srv/vfs/vfs_file.c

@@ -45 +45 @@
 #include <adt/list.h>
 #include <task.h>
-#include <vfs/vfs.h>
 #include "vfs.h"
 
@@ -60 +59 @@
 typedef struct {
         link_t link;
-        vfs_node_t *node;
-        int permissions;
+        int handle;
 } vfs_boxed_handle_t;
 
@@ -179 +177 @@
                  * endpoint FS and drop our reference to the underlying VFS node.
                  */
-                
-                if (file->node != NULL) {
-                        if (file->open_read || file->open_write) {
-                                rc = vfs_file_close_remote(file);
-                        }
-                        vfs_node_delref(file->node);
-                }
+                rc = vfs_file_close_remote(file);
+                vfs_node_delref(file->node);
                 free(file);
         }
@@ -192 +185 @@
 }
 
-static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, vfs_file_t **file, bool desc)
+static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, bool desc)
 {
         if (!vfs_files_init(vfs_data))
@@ -212 +205 @@
                         }
                         
-                        
                         memset(vfs_data->files[i], 0, sizeof(vfs_file_t));
-                        
-                        fibril_mutex_initialize(&vfs_data->files[i]->_lock);
-                        fibril_mutex_lock(&vfs_data->files[i]->_lock);
+                        fibril_mutex_initialize(&vfs_data->files[i]->lock);
                         vfs_file_addref(vfs_data, vfs_data->files[i]);
-                        
-                        *file = vfs_data->files[i];
-                        vfs_file_addref(vfs_data, *file);
-                        
                         fibril_mutex_unlock(&vfs_data->lock);
                         return (int) i;
@@ -245 +231 @@
 /** Allocate a file descriptor.
  *
- * @param file Is set to point to the newly created file structure. Must be put afterwards.
  * @param desc If true, look for an available file descriptor
  *             in a descending order.
@@ -252 +237 @@
  *         code.
  */
-int vfs_fd_alloc(vfs_file_t **file, bool desc)
-{
-        return _vfs_fd_alloc(VFS_DATA, file, desc);
+int vfs_fd_alloc(bool desc)
+{
+        return _vfs_fd_alloc(VFS_DATA, desc);
 }
 
@@ -304 +289 @@
 
         fibril_mutex_lock(&VFS_DATA->lock);     
-        if ((fd < 0) || (fd >= MAX_OPEN_FILES)) {
+        if ((fd < 0) || (fd >= MAX_OPEN_FILES) || (FILES[fd] != NULL)) {
                 fibril_mutex_unlock(&VFS_DATA->lock);
-                return EBADF;
-        }
-        if (FILES[fd] != NULL) {
-                fibril_mutex_unlock(&VFS_DATA->lock);
-                return EEXIST;
+                return EINVAL;
         }
         
@@ -318 +299 @@
         
         return EOK;
-}
-
-static void _vfs_file_put(vfs_client_data_t *vfs_data, vfs_file_t *file)
-{
-        fibril_mutex_unlock(&file->_lock);
-        
-        fibril_mutex_lock(&vfs_data->lock);
-        vfs_file_delref(vfs_data, file);
-        fibril_mutex_unlock(&vfs_data->lock);
 }
 
@@ -340 +312 @@
                         vfs_file_addref(vfs_data, file);
                         fibril_mutex_unlock(&vfs_data->lock);
-                        
-                        fibril_mutex_lock(&file->_lock);
-                        if (file->node == NULL) {
-                                _vfs_file_put(vfs_data, file);
-                                return NULL;
-                        }
-                        assert(file != NULL);
-                        assert(file->node != NULL);
                         return file;
                 }
@@ -367 +331 @@
 }
 
+static void _vfs_file_put(vfs_client_data_t *vfs_data, vfs_file_t *file)
+{
+        fibril_mutex_lock(&vfs_data->lock);
+        vfs_file_delref(vfs_data, file);
+        fibril_mutex_unlock(&vfs_data->lock);
+}
+
 /** Stop using a file structure.
  *
@@ -376 +347 @@
 }
 
-void vfs_op_pass_handle(task_id_t donor_id, task_id_t acceptor_id, int donor_fd)
+void vfs_pass_handle(task_id_t donor_id, task_id_t acceptor_id, int donor_fd)
 {
         vfs_client_data_t *donor_data = NULL;
         vfs_client_data_t *acceptor_data = NULL;
         vfs_file_t *donor_file = NULL;
+        vfs_file_t *acceptor_file = NULL;
         vfs_boxed_handle_t *bh;
+        int acceptor_fd;
 
         acceptor_data = async_get_client_data_by_id(acceptor_id);
@@ -391 +364 @@
 
         link_initialize(&bh->link);
-        bh->node = NULL;
+        bh->handle = -1;
 
         donor_data = async_get_client_data_by_id(donor_id);
@@ -400 +373 @@
         if (!donor_file)
                 goto out;
+
+        acceptor_fd = _vfs_fd_alloc(acceptor_data, false);
+        if (acceptor_fd < 0)
+                goto out;
+
+        bh->handle = acceptor_fd;
 
         /*
@@ -405 +384 @@
          */
         vfs_node_addref(donor_file->node);
-        bh->node = donor_file->node;
-        bh->permissions = donor_file->permissions;
+        (void) vfs_open_node_remote(donor_file->node);
+
+        acceptor_file = _vfs_file_get(acceptor_data, acceptor_fd);
+        assert(acceptor_file);
+
+        /*
+         * Inherit attributes from the donor.
+         */
+        acceptor_file->node = donor_file->node;
+        acceptor_file->append = donor_file->append;
+        acceptor_file->pos = donor_file->pos;
 
 out:
@@ -420 +408 @@
         if (donor_file)
                 _vfs_file_put(donor_data, donor_file);
-}
-
-int vfs_wait_handle_internal(bool high_fd)
+        if (acceptor_file)
+                _vfs_file_put(acceptor_data, acceptor_file);
+
+}
+
+int vfs_wait_handle_internal(void)
 {
         vfs_client_data_t *vfs_data = VFS_DATA; 
+        int fd;
         
         fibril_mutex_lock(&vfs_data->lock);
@@ -434 +426 @@
 
         vfs_boxed_handle_t *bh = list_get_instance(lnk, vfs_boxed_handle_t, link);
-
-        vfs_file_t *file;
-        int fd = _vfs_fd_alloc(vfs_data, &file, high_fd);
-        if (fd < 0) {
-                vfs_node_delref(bh->node);
-                free(bh);
-                return fd;
-        }
-        
-        file->node = bh->node;
-        file->permissions = bh->permissions;
-        vfs_file_put(file);
+        fd = bh->handle;
         free(bh);
+
         return fd;
 }