Changeset 6ad454f in mainline

Timestamp:

2017-12-08T21:03:35Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

a8c7a6d

Parents:

9246016

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 06:01:16)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:03:35)

Message:

Pass file handles separately from error codes.

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (2 diffs)
• vfs_file.c (modified) (6 diffs)
• vfs_ipc.c (modified) (1 diff)
• vfs_ops.c (modified) (8 diffs)

uspace/srv/vfs/vfs.h

@@ -194 +194 @@
 
 extern void vfs_op_pass_handle(task_id_t, task_id_t, int);
-extern int vfs_wait_handle_internal(bool);
+extern int vfs_wait_handle_internal(bool, int *);
 
 extern vfs_file_t *vfs_file_get(int);
 extern void vfs_file_put(vfs_file_t *);
 extern int vfs_fd_assign(vfs_file_t *, int);
-extern int vfs_fd_alloc(vfs_file_t **file, bool desc);
+extern int vfs_fd_alloc(vfs_file_t **file, bool desc, int *);
 extern int vfs_fd_free(int);
 
@@ -220 +220 @@
 extern int vfs_op_unlink(int parentfd, int expectfd, char *path);
 extern int vfs_op_unmount(int mpfd);
-extern int vfs_op_wait_handle(bool high_fd);
+extern int vfs_op_wait_handle(bool high_fd, int *out_fd);
 extern int vfs_op_walk(int parentfd, int flags, char *path, int *out_fd);
 extern int vfs_op_write(int fd, aoff64_t, size_t *out_bytes);

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);
 }
 
@@ -427 +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; 
@@ -441 +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;
         }
         
@@ -452 +454 @@
         vfs_file_put(file);
         free(bh);
-        return fd;
+        return EOK;
 }
 

uspace/srv/vfs/vfs_ipc.c

@@ -280 +280 @@
 {
         bool high_fd = IPC_GET_ARG1(*request);
-        int fd = vfs_op_wait_handle(high_fd);
-        async_answer_1(rid, EOK, fd);
+        int fd = -1;
+        int rc = vfs_op_wait_handle(high_fd, &fd);
+        async_answer_1(rid, rc, fd);
 }
 

uspace/srv/vfs/vfs_ops.c

@@ -104 +104 @@
                 /* Assign the old file to newfd. */
                 rc = vfs_fd_assign(oldfile, newfd);
+                *out_fd = newfd;
         } else {
                 vfs_file_t *newfile;
-                int newfd = vfs_fd_alloc(&newfile, desc);
-                if (newfd >= 0) {
+                rc = vfs_fd_alloc(&newfile, desc, out_fd);
+                if (rc == EOK) {
                         newfile->node = oldfile->node;
                         newfile->permissions = oldfile->permissions;
@@ -114 +115 @@
                         vfs_file_put(newfile);
                 }
-                rc = newfd;
         }
         vfs_file_put(oldfile);
         
-        if (rc < 0) {
-                return rc;
-        }
-        
-        *out_fd = rc;
-        return EOK;
+        return rc;
 }
 
@@ -228 +223 @@
 
 int vfs_op_mount(int mpfd, unsigned service_id, unsigned flags,
-    unsigned instance, const char *opts, const char *fs_name, int *outfd)
+    unsigned instance, const char *opts, const char *fs_name, int *out_fd)
 {
         int rc;
         vfs_file_t *mp = NULL;
         vfs_file_t *file = NULL;
-        int fd = -1;
+        *out_fd = -1;
         
         if (!(flags & VFS_MOUNT_CONNECT_ONLY)) {
@@ -259 +254 @@
         
         if (!(flags & VFS_MOUNT_NO_REF)) {
-                fd = vfs_fd_alloc(&file, false);
-                if (fd < 0) {
-                        rc = fd;
+                rc = vfs_fd_alloc(&file, false, out_fd);
+                if (rc != EOK) {
                         goto out;
                 }
@@ -300 +294 @@
                 vfs_file_put(file);
 
-        if (rc != EOK && fd >= 0) {
-                vfs_fd_free(fd);
-                fd = 0;
-        }
-        
-        *outfd = fd;
+        if (rc != EOK && *out_fd >= 0) {
+                vfs_fd_free(*out_fd);
+                *out_fd = -1;
+        }
+        
         return rc;
 }
@@ -833 +826 @@
 }
 
-int vfs_op_wait_handle(bool high_fd)
-{
-        return vfs_wait_handle_internal(high_fd);
+int vfs_op_wait_handle(bool high_fd, int *out_fd)
+{
+        return vfs_wait_handle_internal(high_fd, out_fd);
 }
 
@@ -897 +890 @@
         
         vfs_file_t *file;
-        int fd = vfs_fd_alloc(&file, false);
-        if (fd < 0) {
+        rc = vfs_fd_alloc(&file, false, out_fd);
+        if (rc != EOK) {
                 vfs_node_put(node);
                 vfs_file_put(parent);
-                return fd;
+                return rc;
         }
         assert(file != NULL);
@@ -915 +908 @@
         fibril_rwlock_read_unlock(&namespace_rwlock);
 
-        *out_fd = fd;
         return EOK;
 }