Changes in uspace/srv/vfs/vfs_file.c [fcab7ef:6ad454f] in mainline

File:

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

uspace/srv/vfs/vfs_file.c

@@ -192 +192 @@
 }
 
-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, vfs_file_t **file, bool desc, int *out_fd)
 {
         if (!vfs_files_init(vfs_data))
@@ -223 +223 @@
                         
                         fibril_mutex_unlock(&vfs_data->lock);
-                        return (int) i;
+                        *out_fd = (int) i;
+                        return EOK;
                 }
                 
@@ -249 +250 @@
  *             in a descending order.
  *
- * @return First available file descriptor or a negative error
- *         code.
- */
-int vfs_fd_alloc(vfs_file_t **file, bool desc)
-{
-        return _vfs_fd_alloc(VFS_DATA, file, desc);
+ * @param[out] out_fd  First available file descriptor
+ *
+ * @return Error code.
+ */
+int vfs_fd_alloc(vfs_file_t **file, bool desc, int *out_fd)
+{
+        return _vfs_fd_alloc(VFS_DATA, file, desc, out_fd);
+}
+
+static int _vfs_fd_free_locked(vfs_client_data_t *vfs_data, int fd)
+{
+        if ((fd < 0) || (fd >= MAX_OPEN_FILES) || !vfs_data->files[fd]) {
+                return EBADF;
+        }
+
+        int rc = vfs_file_delref(vfs_data, vfs_data->files[fd]);
+        vfs_data->files[fd] = NULL;
+        return rc;
 }
 
@@ -265 +278 @@
 
         fibril_mutex_lock(&vfs_data->lock);     
-        if ((fd < 0) || (fd >= MAX_OPEN_FILES) || !vfs_data->files[fd]) {
-                fibril_mutex_unlock(&vfs_data->lock);
-                return EBADF;
-        }
-        
-        rc = vfs_file_delref(vfs_data, vfs_data->files[fd]);
-        vfs_data->files[fd] = NULL;
+        rc = _vfs_fd_free_locked(vfs_data, fd);
         fibril_mutex_unlock(&vfs_data->lock);
         
@@ -308 +315 @@
                 return EBADF;
         }
-        if (FILES[fd] != NULL) {
-                fibril_mutex_unlock(&VFS_DATA->lock);
-                return EEXIST;
-        }
+
+        /* Make sure fd is closed. */
+        (void) _vfs_fd_free_locked(VFS_DATA, fd);
+        assert(FILES[fd] == NULL);
         
         FILES[fd] = file;
@@ -422 +429 @@
 }
 
-int vfs_wait_handle_internal(bool high_fd)
+int vfs_wait_handle_internal(bool high_fd, int *out_fd)
 {
         vfs_client_data_t *vfs_data = VFS_DATA; 
@@ -436 +443 @@
 
         vfs_file_t *file;
-        int fd = _vfs_fd_alloc(vfs_data, &file, high_fd);
-        if (fd < 0) {
+        int rc = _vfs_fd_alloc(vfs_data, &file, high_fd, out_fd);
+        if (rc != EOK) {
                 vfs_node_delref(bh->node);
                 free(bh);
-                return fd;
+                return rc;
         }
         
@@ -447 +454 @@
         vfs_file_put(file);
         free(bh);
-        return fd;
+        return EOK;
 }