Changeset d1e196f7 in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2011-08-21T12:04:27Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

8a6ba94

Parents:

1877128 (diff), a6480d5 (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 mainline changes

File:

• uspace/srv/vfs/vfs_file.c (modified) (5 diffs)

uspace/srv/vfs/vfs_file.c

@@ -44 +44 @@
 #include <fibril_synch.h>
 #include <adt/list.h>
+#include <task.h>
 #include "vfs.h"
 
@@ -346 +347 @@
 }
 
-void vfs_pass_handle(sysarg_t donor_hash, sysarg_t acceptor_hash, int donor_fd)
+void vfs_pass_handle(task_id_t donor_id, task_id_t acceptor_id, int donor_fd)
 {
         vfs_client_data_t *donor_data = NULL;
@@ -355 +356 @@
         int acceptor_fd;
 
-        acceptor_data = async_get_client_data_by_hash(acceptor_hash);
+        acceptor_data = async_get_client_data_by_id(acceptor_id);
         if (!acceptor_data)
                 return;
@@ -365 +366 @@
         bh->handle = -1;
 
-        donor_data = async_get_client_data_by_hash(donor_hash);
+        donor_data = async_get_client_data_by_id(donor_id);
         if (!donor_data)
                 goto out;
@@ -402 +403 @@
 
         if (donor_data)
-                async_put_client_data_by_hash(donor_hash);
+                async_put_client_data_by_id(donor_id);
         if (acceptor_data)
-                async_put_client_data_by_hash(acceptor_hash);
+                async_put_client_data_by_id(acceptor_id);
         if (donor_file)
                 _vfs_file_put(donor_data, donor_file);