Index: uspace/srv/vfs/vfs_ops.c
===================================================================
--- uspace/srv/vfs/vfs_ops.c	(revision e811bde6f914a964b72dca0bd18b4824b04033db)
+++ uspace/srv/vfs/vfs_ops.c	(revision ce7311fc44de2ed378312e829b5d8928ca33d6df)
@@ -85,4 +85,5 @@
 	dev_handle_t dev_handle;
 	vfs_node_t *mp_node = NULL;
+	int rc;
 
 	/*
@@ -168,5 +169,4 @@
 	 * 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,22 +254,18 @@
 	 */
 
+	/**
+	 * @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,10 +274,5 @@
 	}
 	
-	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);
 }