Changeset b74959bd in mainline for uspace/srv/vfs/vfs_register.c

Timestamp:

2007-11-20T21:33:32Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8498915

Parents:

3209923

Message:

Modify ipc_answer_*() to make use of all six syscall arguments. The recommended
means of answering calls is via the ipc_answer_m() macros (where m denotes the
number of return arguments) that automatically decide between the fast register
version or the slow universal version of ipc_answer().

File:

• uspace/srv/vfs/vfs_register.c (modified) (10 diffs)

uspace/srv/vfs/vfs_register.c

@@ -156 +156 @@
          * VFS info structure from the client FS.
          */
-        if (!ipc_data_receive(&callid, &call, NULL, &size)) {
+        if (!ipc_data_receive(&callid, NULL, &size)) {
                 /*
                  * The client doesn't obey the same protocol as we do.
                  */
                 dprintf("Receiving of VFS info failed.\n");
-                ipc_answer_fast_0(callid, EINVAL);
-                ipc_answer_fast_0(rid, EINVAL);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return;
         }
@@ -178 +178 @@
                  */
                 dprintf("Received VFS info has bad size.\n");
-                ipc_answer_fast_0(callid, EINVAL);
-                ipc_answer_fast_0(rid, EINVAL);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return;
         }
@@ -190 +190 @@
         if (!fs_info) {
                 dprintf("Could not allocate memory for FS info.\n");
-                ipc_answer_fast_0(callid, ENOMEM);
-                ipc_answer_fast_0(rid, ENOMEM);
+                ipc_answer_0(callid, ENOMEM);
+                ipc_answer_0(rid, ENOMEM);
                 return;
         }
         link_initialize(&fs_info->fs_link);
                 
-        rc = ipc_data_deliver(callid, &call, &fs_info->vfs_info, size);
+        rc = ipc_data_deliver(callid, &fs_info->vfs_info, size);
         if (rc != EOK) {
                 dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
                     rc);
                 free(fs_info);
-                ipc_answer_fast_0(callid, rc);
-                ipc_answer_fast_0(rid, rc);
+                ipc_answer_0(callid, rc);
+                ipc_answer_0(rid, rc);
                 return;
         }
@@ -210 +210 @@
         if (!vfs_info_sane(&fs_info->vfs_info)) {
                 free(fs_info);
-                ipc_answer_fast_0(callid, EINVAL);
-                ipc_answer_fast_0(rid, EINVAL);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return;
         }
@@ -227 +227 @@
                 futex_up(&fs_head_futex);
                 free(fs_info);
-                ipc_answer_fast_0(callid, EEXISTS);
-                ipc_answer_fast_0(rid, EEXISTS);
+                ipc_answer_0(callid, EEXISTS);
+                ipc_answer_0(rid, EEXISTS);
                 return;
         }
@@ -249 +249 @@
                 futex_up(&fs_head_futex);
                 free(fs_info);
-                ipc_answer_fast_0(callid, EINVAL);
-                ipc_answer_fast_0(rid, EINVAL);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return;
         }
         fs_info->phone = IPC_GET_ARG3(call);
-        ipc_answer_fast_0(callid, EOK);
+        ipc_answer_0(callid, EOK);
 
         dprintf("Callback connection to FS created.\n");
@@ -268 +268 @@
                 ipc_hangup(fs_info->phone);
                 free(fs_info);
-                ipc_answer_fast_0(callid, EINVAL);
-                ipc_answer_fast_0(rid, EINVAL);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return;
         }
@@ -283 +283 @@
                 ipc_hangup(fs_info->phone);
                 free(fs_info);
-                ipc_answer_fast_0(callid, EINVAL);
-                ipc_answer_fast_0(rid, EINVAL);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return;
         }
@@ -291 +291 @@
          * Commit to read-only sharing the PLB with the client.
          */
-        ipc_answer_fast(callid, EOK, (ipcarg_t) plb,
+        ipc_answer_2(callid, EOK, (ipcarg_t) plb,
             (ipcarg_t) (AS_AREA_READ | AS_AREA_CACHEABLE));     
 
@@ -302 +302 @@
          */
         fs_info->fs_handle = (int) atomic_postinc(&fs_handle_next);
-        ipc_answer_fast_1(rid, EOK, (ipcarg_t) fs_info->fs_handle);
+        ipc_answer_1(rid, EOK, (ipcarg_t) fs_info->fs_handle);
         
         futex_up(&fs_head_futex);