Changeset 354b642 in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2017-03-07T10:53:31Z (8 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/vfs/vfs_file.c (modified) (3 diffs)

uspace/srv/vfs/vfs_file.c

@@ -360 +360 @@
 }
 
-void vfs_pass_handle(task_id_t donor_id, task_id_t acceptor_id, int donor_fd)
+void vfs_op_pass_handle(task_id_t donor_id, task_id_t acceptor_id, int donor_fd)
 {
         vfs_client_data_t *donor_data = NULL;
@@ -397 +397 @@
          */
         vfs_node_addref(donor_file->node);
-        (void) vfs_open_node_remote(donor_file->node);
 
         assert(acceptor_file);
@@ -412 +411 @@
         acceptor_file->open_read = donor_file->open_read;
         acceptor_file->open_write = donor_file->open_write;
+
+        if (acceptor_file->open_read || acceptor_file->open_write) {
+                (void) vfs_open_node_remote(acceptor_file->node);
+        }
 
 out: