Changeset 19f24fd in mainline for uspace/srv/vfs/vfs_register.c

Timestamp:

2010-02-05T22:25:52Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dafa2d04

Parents:

83349b03 (diff), d42976c (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) (6 diffs)

uspace/srv/vfs/vfs_register.c

@@ -110 +110 @@
 void vfs_register(ipc_callid_t rid, ipc_call_t *request)
 {
-        ipc_callid_t callid;
-        ipc_call_t call;
-        int rc;
-        size_t size;
-
         dprintf("Processing VFS_REGISTER request received from %p.\n",
             request->in_phone_hash);
-
-        /*
-         * The first call has to be IPC_M_DATA_SEND in which we receive the
-         * VFS info structure from the client FS.
-         */
-        if (!async_data_write_receive(&callid, &size)) {
-                /*
-                 * The client doesn't obey the same protocol as we do.
-                 */
-                dprintf("Receiving of VFS info failed.\n");
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-        
-        dprintf("VFS info received, size = %d\n", size);
-        
-        /*
-         * We know the size of the VFS info structure. See if the client
-         * understands this easy concept too.
-         */
-        if (size != sizeof(vfs_info_t)) {
-                /*
-                 * The client is sending us something, which cannot be
-                 * the info structure.
-                 */
-                dprintf("Received VFS info has bad size.\n");
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-
-        /*
-         * Allocate and initialize a buffer for the fs_info structure.
-         */
-        fs_info_t *fs_info;
-        fs_info = (fs_info_t *) malloc(sizeof(fs_info_t));
-        if (!fs_info) {
-                dprintf("Could not allocate memory for FS info.\n");
-                ipc_answer_0(callid, ENOMEM);
-                ipc_answer_0(rid, ENOMEM);
-                return;
-        }
-        link_initialize(&fs_info->fs_link);
-        fibril_mutex_initialize(&fs_info->phone_lock);
-                
-        rc = async_data_write_finalize(callid, &fs_info->vfs_info, size);
+        
+        vfs_info_t *vfs_info;
+        int rc = async_data_write_accept((void **) &vfs_info, false,
+            sizeof(vfs_info_t), sizeof(vfs_info_t), 0, NULL);
+        
         if (rc != EOK) {
                 dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
                     rc);
-                free(fs_info);
-                ipc_answer_0(callid, rc);
                 ipc_answer_0(rid, rc);
                 return;
         }
-
+        
+        /*
+         * Allocate and initialize a buffer for the fs_info structure.
+         */
+        fs_info_t *fs_info = (fs_info_t *) malloc(sizeof(fs_info_t));
+        if (!fs_info) {
+                dprintf("Could not allocate memory for FS info.\n");
+                ipc_answer_0(rid, ENOMEM);
+                return;
+        }
+        
+        link_initialize(&fs_info->fs_link);
+        fibril_mutex_initialize(&fs_info->phone_lock);
+        fs_info->vfs_info = *vfs_info;
+        free(vfs_info);
+        
         dprintf("VFS info delivered.\n");
-                
+        
         if (!vfs_info_sane(&fs_info->vfs_info)) {
                 free(fs_info);
-                ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
                 return;
         }
-                
+        
         fibril_mutex_lock(&fs_head_lock);
-
+        
         /*
          * Check for duplicit registrations.
@@ -194 +159 @@
                 fibril_mutex_unlock(&fs_head_lock);
                 free(fs_info);
-                ipc_answer_0(callid, EEXISTS);
                 ipc_answer_0(rid, EEXISTS);
                 return;
         }
-
+        
         /*
          * Add fs_info to the list of registered FS's.
@@ -210 +174 @@
          * which to forward VFS requests to it.
          */
-        callid = async_get_call(&call);
+        ipc_call_t call;
+        ipc_callid_t callid = async_get_call(&call);
         if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
                 dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
@@ -222 +187 @@
         fs_info->phone = IPC_GET_ARG5(call);
         ipc_answer_0(callid, EOK);
-
+        
         dprintf("Callback connection to FS created.\n");
-
+        
         /*
          * The client will want us to send him the address space area with PLB.
          */
-
+        
+        size_t size;
         if (!async_share_in_receive(&callid, &size)) {
                 dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
@@ -253 +219 @@
                 return;
         }
-
+        
         /*
          * Commit to read-only sharing the PLB with the client.
@@ -259 +225 @@
         (void) async_share_in_finalize(callid, plb,
             AS_AREA_READ | AS_AREA_CACHEABLE);
-
+        
         dprintf("Sharing PLB.\n");
-
+        
         /*
          * That was it. The FS has been registered.