Changeset ce7311fc in mainline

Timestamp:

2008-05-18T20:20:47Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

64b67c3

Parents:

e811bde

Message:

Cram VFS_MOUNT into one message. This creates a hidden demand for the sixth IPC
argument as there might be a desire to pass some options/flags in the future.

File:

• uspace/srv/vfs/vfs_ops.c (modified) (4 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -85 +85 @@
         dev_handle_t dev_handle;
         vfs_node_t *mp_node = NULL;
+        int rc;
 
         /*
@@ -168 +169 @@
          * that we can track how many times it has been mounted.
          */
-        int rc;
         vfs_lookup_res_t mr_res;
         rc = lookup_root(fs_handle, dev_handle, &mr_res);
@@ -254 +254 @@
          */
 
+        /**
+         * @todo
+         * Add more IPC parameters so that we can send mount mode/flags.
+         */
         int phone = vfs_grab_phone(mp_res.triplet.fs_handle);
-        /* Later we can use ARG3 to pass mode/flags. */
-        aid_t req1 = async_send_3(phone, VFS_MOUNT,
+        rc = async_req_5_0(phone, VFS_MOUNT,
             (ipcarg_t) mp_res.triplet.dev_handle,
-            (ipcarg_t) mp_res.triplet.index, 0, NULL);
-        /* The second call uses the same method. */
-        aid_t req2 = async_send_3(phone, VFS_MOUNT,
+            (ipcarg_t) mp_res.triplet.index,
             (ipcarg_t) mr_res.triplet.fs_handle,
             (ipcarg_t) mr_res.triplet.dev_handle,
-            (ipcarg_t) mr_res.triplet.index, NULL);
+            (ipcarg_t) mr_res.triplet.index);
         vfs_release_phone(phone);
 
-        ipcarg_t rc1;
-        ipcarg_t rc2;
-        async_wait_for(req1, &rc1);
-        async_wait_for(req2, &rc2);
-
-        if ((rc1 != EOK) || (rc2 != EOK)) {
+        if (rc != EOK) {
                 /* Mount failed, drop references to mr_node and mp_node. */
                 vfs_node_put(mr_node);
@@ -278 +274 @@
         }
         
-        if (rc2 == EOK)
-                ipc_answer_0(rid, rc1);
-        else if (rc1 == EOK)
-                ipc_answer_0(rid, rc2);
-        else
-                ipc_answer_0(rid, rc1);
+        ipc_answer_0(rid, rc);
 }