Changeset 34ca870 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2009-06-17T21:07:56Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6ebe721

Parents:

61d2315

Message:

Handle each VFS request using a dedicated connection.

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -144 +144 @@
                             str_size(opts));
                         if (rc != EOK) {
+                                async_wait_for(msg, NULL);
                                 vfs_release_phone(phone);
-                                async_wait_for(msg, NULL);
                                 fibril_rwlock_write_unlock(&namespace_rwlock);
                                 ipc_answer_0(rid, rc);
                                 return;
                         }
+                        async_wait_for(msg, &rc);
                         vfs_release_phone(phone);
-                        async_wait_for(msg, &rc);
                         
                         if (rc != EOK) {
@@ -198 +198 @@
         int mountee_phone = vfs_grab_phone(fs_handle);
         assert(mountee_phone >= 0);
-        vfs_release_phone(mountee_phone);
 
         phone = vfs_grab_phone(mp_res.triplet.fs_handle);
@@ -210 +209 @@
         rc = async_req_1_0(phone, IPC_M_CONNECTION_CLONE, mountee_phone);
         if (rc != EOK) {
+                async_wait_for(msg, NULL);
+                vfs_release_phone(mountee_phone);
                 vfs_release_phone(phone);
-                async_wait_for(msg, NULL);
                 /* Mount failed, drop reference to mp_node. */
                 if (mp_node)
@@ -219 +219 @@
                 return;
         }
+
+        vfs_release_phone(mountee_phone);
         
         /* send the mount options */
         rc = ipc_data_write_start(phone, (void *)opts, str_size(opts));
         if (rc != EOK) {
+                async_wait_for(msg, NULL);
                 vfs_release_phone(phone);
-                async_wait_for(msg, NULL);
                 /* Mount failed, drop reference to mp_node. */
                 if (mp_node)
@@ -232 +234 @@
                 return;
         }
+        async_wait_for(msg, &rc);
         vfs_release_phone(phone);
-        async_wait_for(msg, &rc);
         
         if (rc == EOK) {
@@ -756 +758 @@
         msg = async_send_2(fs_phone, IPC_GET_METHOD(*request),
             file->node->dev_handle, file->node->index, &answer);
-        
-        vfs_release_phone(fs_phone);
 
         /* Wait for reply from the FS server. */
         ipcarg_t rc;
         async_wait_for(msg, &rc);
-        
+
+        vfs_release_phone(fs_phone);
         fibril_mutex_unlock(&file->lock);
         
@@ -792 +793 @@
             file->node->dev_handle, file->node->index, &answer);
 
-        vfs_release_phone(fs_phone);
-
         /* Wait for reply from the FS server. */
         ipcarg_t rc;
         async_wait_for(msg, &rc);
         
+        vfs_release_phone(fs_phone);
         fibril_mutex_unlock(&file->lock);
         
@@ -819 +819 @@
          */
         fibril_mutex_lock(&file->lock);
-        
         int fs_phone = vfs_grab_phone(file->node->fs_handle);
         
@@ -828 +827 @@
             file->node->dev_handle, file->node->index, &answer);
 
-        vfs_release_phone(fs_phone);
-        
         /* Wait for reply from the FS server. */
         ipcarg_t rc;
         async_wait_for(msg, &rc);
-        
+
+        vfs_release_phone(fs_phone);
         fibril_mutex_unlock(&file->lock);
         
@@ -924 +922 @@
         ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
 
-        vfs_release_phone(fs_phone);
-        
         /* Wait for reply from the FS server. */
         ipcarg_t rc;
         async_wait_for(msg, &rc);
+        
+        vfs_release_phone(fs_phone);
         
         size_t bytes = IPC_GET_ARG1(answer);