Changes in uspace/srv/vfs/vfs_file.c [6ad454f:fcab7ef] 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, int *out_fd)
+static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, vfs_file_t **file, bool desc)
 {
         if (!vfs_files_init(vfs_data))
@@ -223 +223 @@
                         
                         fibril_mutex_unlock(&vfs_data->lock);
-                        *out_fd = (int) i;
-                        return EOK;
+                        return (int) i;
                 }
                 
@@ -250 +249 @@
  *             in a descending order.
  *
- * @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;
+ * @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);
 }
 
@@ -278 +265 @@
 
         fibril_mutex_lock(&vfs_data->lock);     
-        rc = _vfs_fd_free_locked(vfs_data, fd);
+        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;
         fibril_mutex_unlock(&vfs_data->lock);
         
@@ -315 +308 @@
                 return EBADF;
         }
-
-        /* Make sure fd is closed. */
-        (void) _vfs_fd_free_locked(VFS_DATA, fd);
-        assert(FILES[fd] == NULL);
+        if (FILES[fd] != NULL) {
+                fibril_mutex_unlock(&VFS_DATA->lock);
+                return EEXIST;
+        }
         
         FILES[fd] = file;
@@ -429 +422 @@
 }
 
-int vfs_wait_handle_internal(bool high_fd, int *out_fd)
+int vfs_wait_handle_internal(bool high_fd)
 {
         vfs_client_data_t *vfs_data = VFS_DATA; 
@@ -443 +436 @@
 
         vfs_file_t *file;
-        int rc = _vfs_fd_alloc(vfs_data, &file, high_fd, out_fd);
-        if (rc != EOK) {
+        int fd = _vfs_fd_alloc(vfs_data, &file, high_fd);
+        if (fd < 0) {
                 vfs_node_delref(bh->node);
                 free(bh);
-                return rc;
+                return fd;
         }
         
@@ -454 +447 @@
         vfs_file_put(file);
         free(bh);
-        return EOK;
+        return fd;
 }