Changes in uspace/srv/vfs/vfs_register.c [a35b458:77f0a1d] in mainline

File:

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

uspace/srv/vfs/vfs_register.c

@@ -108 +108 @@
 /** VFS_REGISTER protocol function.
  *
- * @param rid     Hash of the call with the request.
- * @param request Call structure with the request.
- *
- */
-void vfs_register(ipc_callid_t rid, ipc_call_t *request)
+ * @param req_handle  Call handle of the request.
+ * @param request     Call structure with the request.
+ *
+ */
+void vfs_register(cap_call_handle_t req_handle, ipc_call_t *request)
 {
         dprintf("Processing VFS_REGISTER request received from %zx.\n",
@@ -124 +124 @@
                 dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
                     rc);
-                async_answer_0(rid, rc);
+                async_answer_0(req_handle, rc);
                 return;
         }
@@ -134 +134 @@
         if (!fs_info) {
                 dprintf("Could not allocate memory for FS info.\n");
-                async_answer_0(rid, ENOMEM);
+                async_answer_0(req_handle, ENOMEM);
                 return;
         }
@@ -146 +146 @@
         if (!vfs_info_sane(&fs_info->vfs_info)) {
                 free(fs_info);
-                async_answer_0(rid, EINVAL);
+                async_answer_0(req_handle, EINVAL);
                 return;
         }
@@ -163 +163 @@
                 fibril_mutex_unlock(&fs_list_lock);
                 free(fs_info);
-                async_answer_0(rid, EEXIST);
+                async_answer_0(req_handle, EEXIST);
                 return;
         }
@@ -184 +184 @@
                 fibril_mutex_unlock(&fs_list_lock);
                 free(fs_info);
-                async_answer_0(rid, EINVAL);
+                async_answer_0(req_handle, EINVAL);
                 return;
         }
@@ -195 +195 @@
 
         size_t size;
-        ipc_callid_t callid;
-        if (!async_share_in_receive(&callid, &size)) {
+        cap_call_handle_t chandle;
+        if (!async_share_in_receive(&chandle, &size)) {
                 dprintf("Unexpected call\n");
                 list_remove(&fs_info->fs_link);
@@ -202 +202 @@
                 async_hangup(fs_info->sess);
                 free(fs_info);
-                async_answer_0(callid, EINVAL);
-                async_answer_0(rid, EINVAL);
+                async_answer_0(chandle, EINVAL);
+                async_answer_0(req_handle, EINVAL);
                 return;
         }
@@ -216 +216 @@
                 async_hangup(fs_info->sess);
                 free(fs_info);
-                async_answer_0(callid, EINVAL);
-                async_answer_0(rid, EINVAL);
+                async_answer_0(chandle, EINVAL);
+                async_answer_0(req_handle, EINVAL);
                 return;
         }
@@ -224 +224 @@
          * Commit to read-only sharing the PLB with the client.
          */
-        (void) async_share_in_finalize(callid, plb,
+        (void) async_share_in_finalize(chandle, plb,
             AS_AREA_READ | AS_AREA_CACHEABLE);
 
@@ -235 +235 @@
          */
         fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
-        async_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle);
+        async_answer_1(req_handle, EOK, (sysarg_t) fs_info->fs_handle);
 
         fibril_condvar_broadcast(&fs_list_cv);