Changes in uspace/srv/vfs/vfs_ops.c [6ad454f:d2c8533] in mainline

File:

• uspace/srv/vfs/vfs_ops.c (modified) (9 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -86 +86 @@
 }
 
-int vfs_op_clone(int oldfd, int newfd, bool desc, int *out_fd)
+int vfs_op_clone(int oldfd, int newfd, bool desc)
 {
         int rc;
@@ -102 +102 @@
 
         if (newfd != -1) {
+                /* Make sure newfd is closed. */
+                (void) vfs_fd_free(newfd);
                 /* Assign the old file to newfd. */
                 rc = vfs_fd_assign(oldfile, newfd);
-                *out_fd = newfd;
         } else {
                 vfs_file_t *newfile;
-                rc = vfs_fd_alloc(&newfile, desc, out_fd);
-                if (rc == EOK) {
+                int newfd = vfs_fd_alloc(&newfile, desc);
+                if (newfd >= 0) {
                         newfile->node = oldfile->node;
                         newfile->permissions = oldfile->permissions;
@@ -115 +116 @@
                         vfs_file_put(newfile);
                 }
+                rc = newfd;
         }
         vfs_file_put(oldfile);
@@ -223 +225 @@
 
 int vfs_op_mount(int mpfd, unsigned service_id, unsigned flags,
-    unsigned instance, const char *opts, const char *fs_name, int *out_fd)
+    unsigned instance, const char *opts, const char *fs_name, int *outfd)
 {
         int rc;
         vfs_file_t *mp = NULL;
         vfs_file_t *file = NULL;
-        *out_fd = -1;
+        int fd = -1;
         
         if (!(flags & VFS_MOUNT_CONNECT_ONLY)) {
@@ -254 +256 @@
         
         if (!(flags & VFS_MOUNT_NO_REF)) {
-                rc = vfs_fd_alloc(&file, false, out_fd);
-                if (rc != EOK) {
+                fd = vfs_fd_alloc(&file, false);
+                if (fd < 0) {
+                        rc = fd;
                         goto out;
                 }
@@ -294 +297 @@
                 vfs_file_put(file);
 
-        if (rc != EOK && *out_fd >= 0) {
-                vfs_fd_free(*out_fd);
-                *out_fd = -1;
-        }
-        
+        if (rc != EOK && fd >= 0) {
+                vfs_fd_free(fd);
+                fd = 0;
+        }
+        
+        *outfd = fd;
         return rc;
 }
@@ -826 +830 @@
 }
 
-int vfs_op_wait_handle(bool high_fd, int *out_fd)
-{
-        return vfs_wait_handle_internal(high_fd, out_fd);
+int vfs_op_wait_handle(bool high_fd)
+{
+        return vfs_wait_handle_internal(high_fd);
 }
 
@@ -890 +894 @@
         
         vfs_file_t *file;
-        rc = vfs_fd_alloc(&file, false, out_fd);
-        if (rc != EOK) {
+        int fd = vfs_fd_alloc(&file, false);
+        if (fd < 0) {
                 vfs_node_put(node);
                 vfs_file_put(parent);
-                return rc;
+                return fd;
         }
         assert(file != NULL);
@@ -908 +912 @@
         fibril_rwlock_read_unlock(&namespace_rwlock);
 
+        *out_fd = fd;
         return EOK;
 }