Changes in uspace/srv/vfs/vfs_file.c [1e4cada:553492be] in mainline

File:

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

uspace/srv/vfs/vfs_file.c

@@ -42 +42 @@
 #include <bool.h>
 #include <fibril.h>
-#include <fibril_synch.h>
+#include <fibril_sync.h>
 #include "vfs.h"
 
@@ -76 +76 @@
 /** Allocate a file descriptor.
  *
- * @param desc If true, look for an available file descriptor
- *             in a descending order.
- *
- * @return First available file descriptor or a negative error
- *         code.
+ * @return              First available file descriptor or a negative error
+ *                      code.
  */
-int vfs_fd_alloc(bool desc)
+int vfs_fd_alloc(void)
 {
         if (!vfs_files_init())
@@ -88 +85 @@
         
         unsigned int i;
-        if (desc)
-                i = MAX_OPEN_FILES - 1;
-        else
-                i = 0;
-        
-        while (true) {
+        for (i = 0; i < MAX_OPEN_FILES; i++) {
                 if (!files[i]) {
                         files[i] = (vfs_file_t *) malloc(sizeof(vfs_file_t));
@@ -103 +95 @@
                         vfs_file_addref(files[i]);
                         return (int) i;
-                }
-                
-                if (desc) {
-                        if (i == 0)
-                                break;
-                        
-                        i--;
-                } else {
-                        if (i == MAX_OPEN_FILES - 1)
-                                break;
-                        
-                        i++;
                 }
         }
@@ -138 +118 @@
         vfs_file_delref(files[fd]);
         files[fd] = NULL;
-        
-        return EOK;
-}
-
-/** Assign a file to a file descriptor.
- *
- * @param file File to assign.
- * @param fd   File descriptor to assign to.
- *
- * @return EOK on success or EINVAL if fd is an invalid or already
- *         used file descriptor.
- *
- */
-int vfs_fd_assign(vfs_file_t *file, int fd)
-{
-        if (!vfs_files_init())
-                return ENOMEM;
-        
-        if ((fd < 0) || (fd >= MAX_OPEN_FILES) || (files[fd] != NULL))
-                return EINVAL;
-        
-        files[fd] = file;
-        vfs_file_addref(files[fd]);
         
         return EOK;