Changeset 354b642 in mainline for uspace/srv/loader/main.c

Timestamp:

2017-03-07T10:53:31Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a274a5f

Parents:

c577a9a

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-07 10:53:31)

git-committer:

Jakub Jermar <jakub@…> (2017-03-07 10:53:31)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revisions 1932-1936

Original commit messages:

1936: Jiri Zarevucky 2013-08-05 Modifications to vfs_rdwr.
1935: Jiri Zarevucky 2013-08-05 Fix a bug in read/write.
1934: Jiri Zarevucky 2013-08-05 Fix a hidden bug in handle passing.
1933: Jiri Zarevucky 2013-08-05 Add VFS_IN_CLONE.
1932: Jiri Zarevucky 2013-08-05 Add functions for passing handles around.

Modifications:

• New vcl_* interfaces renamed to vfs_*
• Server-side vfs_pass_handle() and vfs_clone() renamed to vfs_op_* to avoid name conflict with libc

File:

• uspace/srv/loader/main.c (modified) (1 diff)

uspace/srv/loader/main.c

@@ -227 +227 @@
 
         for (filc = 0; filc < count; filc++) {
-                ipc_callid_t callid;
-                int fd;
-
-                if (!async_state_change_receive(&callid, NULL, NULL, NULL)) {
-                        async_answer_0(callid, EINVAL);
+                int fd = vfs_receive_handle();
+                if (fd < 0) {
                         break;
                 }
-                async_state_change_finalize(callid, vfs_exch);
-                fd = vfs_fd_wait();
                 assert(fd == (int) filc);
         }