Changeset c577a9a in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2017-03-05T20:23:05Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

354b642

Parents:

1dff985

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-05 20:23:05)

git-committer:

Jakub Jermar <jakub@…> (2017-03-05 20:23:05)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5 revisions 1929-1930

File:

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

uspace/srv/vfs/vfs_file.c

@@ -187 +187 @@
 }
 
-static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, bool desc)
+static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, vfs_file_t **file, bool desc)
 {
         if (!vfs_files_init(vfs_data))
@@ -207 +207 @@
                         }
                         
+                        
                         memset(vfs_data->files[i], 0, sizeof(vfs_file_t));
-                        fibril_mutex_initialize(&vfs_data->files[i]->lock);
+                        
+                        fibril_mutex_initialize(&vfs_data->files[i]->_lock);
+                        fibril_mutex_lock(&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;
@@ -233 +240 @@
 /** 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.
@@ -239 +247 @@
  *         code.
  */
-int vfs_fd_alloc(bool desc)
-{
-        return _vfs_fd_alloc(VFS_DATA, desc);
+int vfs_fd_alloc(vfs_file_t **file, bool desc)
+{
+        return _vfs_fd_alloc(VFS_DATA, file, desc);
 }
 
@@ -314 +322 @@
                         vfs_file_addref(vfs_data, file);
                         fibril_mutex_unlock(&vfs_data->lock);
+                        fibril_mutex_lock(&file->_lock);
                         return file;
                 }
@@ -335 +344 @@
 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);
@@ -376 +387 @@
                 goto out;
 
-        acceptor_fd = _vfs_fd_alloc(acceptor_data, false);
+        acceptor_fd = _vfs_fd_alloc(acceptor_data, &acceptor_file, false);
         if (acceptor_fd < 0)
                 goto out;
@@ -388 +399 @@
         (void) vfs_open_node_remote(donor_file->node);
 
-        acceptor_file = _vfs_file_get(acceptor_data, acceptor_fd);
         assert(acceptor_file);