Changeset 132ab5d1 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -86 +86 @@
 }
 
-int vfs_op_clone(int oldfd, int newfd, bool desc)
+int vfs_op_clone(int oldfd, int newfd, bool desc, int *out_fd)
 {
         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;
-                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;
@@ -116 +115 @@
                         vfs_file_put(newfile);
                 }
-                rc = newfd;
         }
         vfs_file_put(oldfile);
@@ -154 +152 @@
             &answer);
         /* Send the mount options */
-        sysarg_t rc = async_data_write_start(exch, options, str_size(options));
+        int rc = async_data_write_start(exch, options, str_size(options));
         if (rc != EOK) {
                 async_forget(msg);
@@ -194 +192 @@
 {
         fs_handle_t fs_handle = 0;
-        sysarg_t rc;
+        int rc;
         int retval;
         
@@ -225 +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)) {
@@ -256 +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;
                 }
@@ -297 +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;
 }
@@ -402 +398 @@
         }
         
-        sysarg_t rc;
+        int rc;
         async_wait_for(msg, &rc);
         
@@ -681 +677 @@
         vfs_exchange_release(fs_exch);
         
-        sysarg_t rc;
+        int rc;
         async_wait_for(msg, &rc);
         
@@ -693 +689 @@
 {
         async_exch_t *exch = vfs_exchange_grab(fs_handle);
-        sysarg_t rc = async_req_4_0(exch, VFS_OUT_TRUNCATE,
+        int rc = async_req_4_0(exch, VFS_OUT_TRUNCATE,
             (sysarg_t) service_id, (sysarg_t) index, LOWER32(size),
             UPPER32(size));
@@ -830 +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);
 }
 
@@ -894 +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);
@@ -912 +908 @@
         fibril_rwlock_read_unlock(&namespace_rwlock);
 
-        *out_fd = fd;
         return EOK;
 }