Changeset f77c1c9 in mainline for uspace/srv/vfs

Timestamp:

2017-12-08T21:03:35Z (8 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:

c19a5a59

Parents:

c1694b6b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 19:44:55)

git-committer:

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

Message:

Return VFS handles separately from error codes.

Location:

uspace/srv/vfs

Files:

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

uspace/srv/vfs/vfs.h

@@ -206 +206 @@
 extern int vfs_open_node_remote(vfs_node_t *);
 
-extern int vfs_op_clone(int oldfd, int newfd, bool desc);
+extern int vfs_op_clone(int oldfd, int newfd, bool desc, int *);
 extern int vfs_op_fsprobe(const char *, service_id_t, vfs_fs_probe_info_t *);
 extern int vfs_op_mount(int mpfd, unsigned servid, unsigned flags, unsigned instance, const char *opts, const char *fsname, int *outfd);

uspace/srv/vfs/vfs_ipc.c

@@ -41 +41 @@
         bool desc = IPC_GET_ARG3(*request);
         
-        int ret = vfs_op_clone(oldfd, newfd, desc);
-        async_answer_0(rid, ret);
+        int outfd = -1;
+        int rc = vfs_op_clone(oldfd, newfd, desc, &outfd);
+        async_answer_1(rid, rc, outfd);
 }
 

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;
@@ -118 +118 @@
         vfs_file_put(oldfile);
         
-        return rc;
+        if (rc < 0) {
+                return rc;
+        }
+        
+        *out_fd = rc;
+        return EOK;
 }