Changeset e2ab36f1 in mainline for uspace/srv/vfs

Timestamp:

2011-08-19T12:38:09Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

36b16bc, 9247c02c

Parents:

903bac0a

Message:

Track client data by client task ID instead of client task hash.

Location:

uspace/srv/vfs

Files:

• vfs.c (modified) (3 diffs)
• vfs.h (modified) (2 diffs)
• vfs_file.c (modified) (5 diffs)

uspace/srv/vfs/vfs.c

@@ -36 +36 @@
  */
 
+#include <vfs/vfs.h>
 #include <ipc/services.h>
 #include <abi/ipc/event.h>
@@ -47 +48 @@
 #include <as.h>
 #include <atomic.h>
-#include <vfs/vfs.h>
+#include <macros.h>
 #include "vfs.h"
 
@@ -143 +144 @@
         case VFS_TASK_STATE_CHANGE:
                 if (IPC_GET_ARG1(*call) == VFS_PASS_HANDLE)
-                        vfs_pass_handle(IPC_GET_ARG4(*call),
-                            IPC_GET_ARG5(*call), (int) IPC_GET_ARG2(*call));
+                        vfs_pass_handle(
+                            (task_id_t) MERGE_LOUP32(IPC_GET_ARG4(*call),
+                            IPC_GET_ARG5(*call)), call->in_task_id,
+                            (int) IPC_GET_ARG2(*call));
                 break;
         default:

uspace/srv/vfs/vfs.h

@@ -41 +41 @@
 #include <bool.h>
 #include <ipc/vfs.h>
+#include <task.h>
 
 #ifndef dprintf
@@ -188 +189 @@
 extern void vfs_client_data_destroy(void *);
 
-extern void vfs_pass_handle(sysarg_t, sysarg_t, int);
+extern void vfs_pass_handle(task_id_t, task_id_t, int);
 extern int vfs_wait_handle_internal(void);
 

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);