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

Timestamp:

2011-02-04T21:00:56Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

474afc9, 960ff451

Parents:

400575c5 (diff), 17aca1c (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_register.c (modified) (10 diffs)

uspace/srv/vfs/vfs_register.c

@@ -36 +36 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <async.h>
@@ -122 +121 @@
                 dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
                     rc);
-                ipc_answer_0(rid, rc);
+                async_answer_0(rid, rc);
                 return;
         }
@@ -132 +131 @@
         if (!fs_info) {
                 dprintf("Could not allocate memory for FS info.\n");
-                ipc_answer_0(rid, ENOMEM);
+                async_answer_0(rid, ENOMEM);
                 return;
         }
@@ -144 +143 @@
         if (!vfs_info_sane(&fs_info->vfs_info)) {
                 free(fs_info);
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -160 +159 @@
                 fibril_mutex_unlock(&fs_head_lock);
                 free(fs_info);
-                ipc_answer_0(rid, EEXISTS);
+                async_answer_0(rid, EEXISTS);
                 return;
         }
@@ -182 +181 @@
                 fibril_mutex_unlock(&fs_head_lock);
                 free(fs_info);
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -189 +188 @@
         phone = IPC_GET_ARG5(call);
         async_session_create(&fs_info->session, phone, 0);
-        ipc_answer_0(callid, EOK);
+        async_answer_0(callid, EOK);
         
         dprintf("Callback connection to FS created.\n");
@@ -203 +202 @@
                 fibril_mutex_unlock(&fs_head_lock);
                 async_session_destroy(&fs_info->session);
-                ipc_hangup(phone);
-                free(fs_info);
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
+                async_hangup(phone);
+                free(fs_info);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -218 +217 @@
                 fibril_mutex_unlock(&fs_head_lock);
                 async_session_destroy(&fs_info->session);
-                ipc_hangup(phone);
-                free(fs_info);
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
+                async_hangup(phone);
+                free(fs_info);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -239 +238 @@
          */
         fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
-        ipc_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle);
+        async_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle);
         
         fibril_condvar_broadcast(&fs_head_cv);