Changes in uspace/srv/vfs/vfs_ops.c [ccca251:5bb9907] in mainline

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -76 +76 @@
         vfs_node_t *mr_node;
         fs_index_t rindex;
-        size_t rsize;
+        aoff64_t rsize;
         unsigned rlnkcnt;
+        async_exch_t *exch;
         sysarg_t rc;
-        int phone;
         aid_t msg;
         ipc_call_t answer;
@@ -123 +123 @@
                         
                         /* Tell the mountee that it is being mounted. */
-                        phone = vfs_grab_phone(fs_handle);
-                        msg = async_send_1(phone, VFS_OUT_MOUNTED,
+                        exch = vfs_exchange_grab(fs_handle);
+                        msg = async_send_1(exch, VFS_OUT_MOUNTED,
                             (sysarg_t) devmap_handle, &answer);
-                        /* send the mount options */
-                        rc = async_data_write_start(phone, (void *)opts,
+                        /* Send the mount options */
+                        rc = async_data_write_start(exch, (void *)opts,
                             str_size(opts));
+                        vfs_exchange_release(exch);
+                        
                         if (rc != EOK) {
                                 async_wait_for(msg, NULL);
-                                vfs_release_phone(fs_handle, phone);
                                 fibril_rwlock_write_unlock(&namespace_rwlock);
                                 async_answer_0(rid, rc);
@@ -137 +138 @@
                         }
                         async_wait_for(msg, &rc);
-                        vfs_release_phone(fs_handle, phone);
                         
                         if (rc != EOK) {
@@ -146 +146 @@
 
                         rindex = (fs_index_t) IPC_GET_ARG1(answer);
-                        rsize = (size_t) IPC_GET_ARG2(answer);
-                        rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
+                        rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
+                        rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
                         
                         mr_res.triplet.fs_handle = fs_handle;
@@ -182 +182 @@
          */
         
-        int mountee_phone = vfs_grab_phone(fs_handle);
-        assert(mountee_phone >= 0);
-
-        phone = vfs_grab_phone(mp_res.triplet.fs_handle);
-        msg = async_send_4(phone, VFS_OUT_MOUNT,
+        async_exch_t *mountee_exch = vfs_exchange_grab(fs_handle);
+        assert(mountee_exch);
+        
+        exch = vfs_exchange_grab(mp_res.triplet.fs_handle);
+        msg = async_send_4(exch, VFS_OUT_MOUNT,
             (sysarg_t) mp_res.triplet.devmap_handle,
             (sysarg_t) mp_res.triplet.index,
@@ -192 +192 @@
             (sysarg_t) devmap_handle, &answer);
         
-        /* send connection */
-        rc = async_req_1_0(phone, IPC_M_CONNECTION_CLONE, mountee_phone);
-        if (rc != EOK) {
+        /* Send connection */
+        rc = async_exchange_clone(exch, mountee_exch);
+        vfs_exchange_release(mountee_exch);
+        
+        if (rc != EOK) {
+                vfs_exchange_release(exch);
                 async_wait_for(msg, NULL);
-                vfs_release_phone(fs_handle, mountee_phone);
-                vfs_release_phone(mp_res.triplet.fs_handle, phone);
+                
                 /* Mount failed, drop reference to mp_node. */
                 if (mp_node)
                         vfs_node_put(mp_node);
-                async_answer_0(rid, rc);
-                fibril_rwlock_write_unlock(&namespace_rwlock);
-                return;
-        }
-
-        vfs_release_phone(fs_handle, mountee_phone);
+                
+                async_answer_0(rid, rc);
+                fibril_rwlock_write_unlock(&namespace_rwlock);
+                return;
+        }
         
         /* send the mount options */
-        rc = async_data_write_start(phone, (void *)opts, str_size(opts));
-        if (rc != EOK) {
+        rc = async_data_write_start(exch, (void *) opts, str_size(opts));
+        if (rc != EOK) {
+                vfs_exchange_release(exch);
                 async_wait_for(msg, NULL);
-                vfs_release_phone(mp_res.triplet.fs_handle, phone);
+                
                 /* Mount failed, drop reference to mp_node. */
                 if (mp_node)
                         vfs_node_put(mp_node);
-                fibril_rwlock_write_unlock(&namespace_rwlock);
-                async_answer_0(rid, rc);
-                return;
-        }
+                
+                fibril_rwlock_write_unlock(&namespace_rwlock);
+                async_answer_0(rid, rc);
+                return;
+        }
+        
+        vfs_exchange_release(exch);
         async_wait_for(msg, &rc);
-        vfs_release_phone(mp_res.triplet.fs_handle, phone);
         
         if (rc == EOK) {
                 rindex = (fs_index_t) IPC_GET_ARG1(answer);
-                rsize = (size_t) IPC_GET_ARG2(answer);
-                rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
-        
+                rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
+                    IPC_GET_ARG3(answer));
+                rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
+                
                 mr_res.triplet.fs_handle = fs_handle;
                 mr_res.triplet.devmap_handle = devmap_handle;
@@ -234 +239 @@
                 mr_res.lnkcnt = rlnkcnt;
                 mr_res.type = VFS_NODE_DIRECTORY;
-        
+                
                 /* Add reference to the mounted root. */
                 mr_node = vfs_node_get(&mr_res); 
@@ -243 +248 @@
                         vfs_node_put(mp_node);
         }
-
+        
         async_answer_0(rid, rc);
         fibril_rwlock_write_unlock(&namespace_rwlock);
@@ -303 +308 @@
         
         /*
-         * Wait for IPC_M_PING so that we can return an error if we don't know
+         * Wait for VFS_IN_PING so that we can return an error if we don't know
          * fs_name.
          */
         ipc_call_t data;
         ipc_callid_t callid = async_get_call(&data);
-        if (IPC_GET_IMETHOD(data) != IPC_M_PING) {
+        if (IPC_GET_IMETHOD(data) != VFS_IN_PING) {
                 async_answer_0(callid, ENOTSUP);
                 async_answer_0(rid, ENOTSUP);
@@ -321 +326 @@
          * This will also give us its file system handle.
          */
-        fibril_mutex_lock(&fs_head_lock);
+        fibril_mutex_lock(&fs_list_lock);
         fs_handle_t fs_handle;
 recheck:
@@ -327 +332 @@
         if (!fs_handle) {
                 if (flags & IPC_FLAG_BLOCKING) {
-                        fibril_condvar_wait(&fs_head_cv, &fs_head_lock);
+                        fibril_condvar_wait(&fs_list_cv, &fs_list_lock);
                         goto recheck;
                 }
                 
-                fibril_mutex_unlock(&fs_head_lock);
+                fibril_mutex_unlock(&fs_list_lock);
                 async_answer_0(callid, ENOENT);
                 async_answer_0(rid, ENOENT);
@@ -339 +344 @@
                 return;
         }
-        fibril_mutex_unlock(&fs_head_lock);
+        fibril_mutex_unlock(&fs_list_lock);
         
         /* Acknowledge that we know fs_name. */
@@ -358 +363 @@
         vfs_lookup_res_t mr_res;
         vfs_node_t *mr_node;
-        int phone;
-
+        async_exch_t *exch;
+        
         /*
          * Receive the mount point path.
@@ -367 +372 @@
         if (rc != EOK)
                 async_answer_0(rid, rc);
-
+        
         /*
          * Taking the namespace lock will do two things for us. First, it will
@@ -395 +400 @@
                 return;
         }
-
+        
         /*
          * Count the total number of references for the mounted file system. We
@@ -411 +416 @@
                 return;
         }
-
+        
         if (str_cmp(mp, "/") == 0) {
-
+                
                 /*
                  * Unmounting the root file system.
@@ -420 +425 @@
                  * VFS_OUT_UNMOUNTED directly to the mounted file system.
                  */
-
+                
                 free(mp);
-                phone = vfs_grab_phone(mr_node->fs_handle);
-                rc = async_req_1_0(phone, VFS_OUT_UNMOUNTED,
+                
+                exch = vfs_exchange_grab(mr_node->fs_handle);
+                rc = async_req_1_0(exch, VFS_OUT_UNMOUNTED,
                     mr_node->devmap_handle);
-                vfs_release_phone(mr_node->fs_handle, phone);
+                vfs_exchange_release(exch);
+                
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
@@ -432 +439 @@
                         return;
                 }
+                
                 rootfs.fs_handle = 0;
                 rootfs.devmap_handle = 0;
         } else {
-
+                
                 /*
                  * Unmounting a non-root file system.
@@ -442 +450 @@
                  * file system, so we delegate the operation to it.
                  */
-
+                
                 rc = vfs_lookup_internal(mp, L_MP, &mp_res, NULL);
                 free(mp);
@@ -451 +459 @@
                         return;
                 }
+                
                 vfs_node_t *mp_node = vfs_node_get(&mp_res);
                 if (!mp_node) {
@@ -458 +467 @@
                         return;
                 }
-
-                phone = vfs_grab_phone(mp_node->fs_handle);
-                rc = async_req_2_0(phone, VFS_OUT_UNMOUNT,
+                
+                exch = vfs_exchange_grab(mp_node->fs_handle);
+                rc = async_req_2_0(exch, VFS_OUT_UNMOUNT,
                     mp_node->devmap_handle, mp_node->index);
-                vfs_release_phone(mp_node->fs_handle, phone);
+                vfs_exchange_release(exch);
+                
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
@@ -470 +480 @@
                         return;
                 }
-
+                
                 /* Drop the reference we got above. */
                 vfs_node_put(mp_node);
@@ -476 +486 @@
                 vfs_node_put(mp_node);
         }
-
-
+        
         /*
          * All went well, the mounted file system was successfully unmounted.
@@ -483 +492 @@
          */
         vfs_node_forget(mr_node);
-
+        
         fibril_rwlock_write_unlock(&namespace_rwlock);
         async_answer_0(rid, EOK);
@@ -698 +707 @@
          */
         fibril_mutex_lock(&file->lock);
-        int fs_phone = vfs_grab_phone(file->node->fs_handle);
+        async_exch_t *fs_exch = vfs_exchange_grab(file->node->fs_handle);
         
         /* Make a VFS_OUT_SYMC request at the destination FS server. */
         aid_t msg;
         ipc_call_t answer;
-        msg = async_send_2(fs_phone, VFS_OUT_SYNC, file->node->devmap_handle,
+        msg = async_send_2(fs_exch, VFS_OUT_SYNC, file->node->devmap_handle,
             file->node->index, &answer);
-
+        
+        vfs_exchange_release(fs_exch);
+        
         /* Wait for reply from the FS server. */
         sysarg_t rc;
         async_wait_for(msg, &rc);
         
-        vfs_release_phone(file->node->fs_handle, fs_phone);
         fibril_mutex_unlock(&file->lock);
-
+        
         vfs_file_put(file);
         async_answer_0(rid, rc);
 }
 
-int vfs_close_internal(vfs_file_t *file)
-{
-        /*
-         * Lock the open file structure so that no other thread can manipulate
-         * the same open file at a time.
-         */
-        fibril_mutex_lock(&file->lock);
-        
-        if (file->refcnt <= 1) {
-                /* Only close the file on the destination FS server
-                   if there are no more file descriptors (except the
-                   present one) pointing to this file. */
-                
-                int fs_phone = vfs_grab_phone(file->node->fs_handle);
-                
-                /* Make a VFS_OUT_CLOSE request at the destination FS server. */
-                aid_t msg;
-                ipc_call_t answer;
-                msg = async_send_2(fs_phone, VFS_OUT_CLOSE,
-                    file->node->devmap_handle, file->node->index, &answer);
-                
-                /* Wait for reply from the FS server. */
-                sysarg_t rc;
-                async_wait_for(msg, &rc);
-                
-                vfs_release_phone(file->node->fs_handle, fs_phone);
-                fibril_mutex_unlock(&file->lock);
-                
-                return IPC_GET_ARG1(answer);
-        }
-        
-        fibril_mutex_unlock(&file->lock);
-        return EOK;
-}
-
 void vfs_close(ipc_callid_t rid, ipc_call_t *request)
 {
         int fd = IPC_GET_ARG1(*request);
-        
-        /* Lookup the file structure corresponding to the file descriptor. */
-        vfs_file_t *file = vfs_file_get(fd);
-        if (!file) {
-                async_answer_0(rid, ENOENT);
-                return;
-        }
-        
-        int ret = vfs_close_internal(file);
-        if (ret != EOK)
-                async_answer_0(rid, ret);
-        
-        vfs_file_put(file);
-        ret = vfs_fd_free(fd);
+        int ret = vfs_fd_free(fd);
         async_answer_0(rid, ret);
 }
@@ -774 +736 @@
 static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read)
 {
-        vfs_info_t *vi;
-
         /*
          * The following code strongly depends on the fact that the files data
@@ -785 +745 @@
          * open files supports parallel access!
          */
-
+        
         int fd = IPC_GET_ARG1(*request);
         
@@ -800 +760 @@
          */
         fibril_mutex_lock(&file->lock);
-
-        vi = fs_handle_to_info(file->node->fs_handle);
-        assert(vi);
-
+        
+        vfs_info_t *fs_info = fs_handle_to_info(file->node->fs_handle);
+        assert(fs_info);
+        
         /*
          * Lock the file's node so that no other client can read/write to it at
@@ -809 +769 @@
          * write implementation does not modify the file size.
          */
-        if (read || (vi->concurrent_read_write && vi->write_retains_size))
+        if ((read) ||
+            ((fs_info->concurrent_read_write) && (fs_info->write_retains_size)))
                 fibril_rwlock_read_lock(&file->node->contents_rwlock);
         else
                 fibril_rwlock_write_lock(&file->node->contents_rwlock);
-
+        
         if (file->node->type == VFS_NODE_DIRECTORY) {
                 /*
@@ -823 +784 @@
         }
         
-        int fs_phone = vfs_grab_phone(file->node->fs_handle);
+        async_exch_t *fs_exch = vfs_exchange_grab(file->node->fs_handle);
         
         /*
@@ -835 +796 @@
         ipc_call_t answer;
         if (read) {
-                rc = async_data_read_forward_3_1(fs_phone, VFS_OUT_READ,
-                    file->node->devmap_handle, file->node->index, file->pos,
-                    &answer);
+                rc = async_data_read_forward_4_1(fs_exch, VFS_OUT_READ,
+                    file->node->devmap_handle, file->node->index,
+                    LOWER32(file->pos), UPPER32(file->pos), &answer);
         } else {
                 if (file->append)
                         file->pos = file->node->size;
                 
-                rc = async_data_write_forward_3_1(fs_phone, VFS_OUT_WRITE,
-                    file->node->devmap_handle, file->node->index, file->pos,
-                    &answer);
-        }
-        
-        vfs_release_phone(file->node->fs_handle, fs_phone);
+                rc = async_data_write_forward_4_1(fs_exch, VFS_OUT_WRITE,
+                    file->node->devmap_handle, file->node->index,
+                    LOWER32(file->pos), UPPER32(file->pos), &answer);
+        }
+        
+        vfs_exchange_release(fs_exch);
         
         size_t bytes = IPC_GET_ARG1(answer);
@@ -855 +816 @@
         
         /* Unlock the VFS node. */
-        if (read || (vi->concurrent_read_write && vi->write_retains_size))
+        if ((read) ||
+            ((fs_info->concurrent_read_write) && (fs_info->write_retains_size)))
                 fibril_rwlock_read_unlock(&file->node->contents_rwlock);
         else {
                 /* Update the cached version of node's size. */
                 if (rc == EOK)
-                        file->node->size = IPC_GET_ARG2(answer); 
+                        file->node->size = MERGE_LOUP32(IPC_GET_ARG2(answer),
+                            IPC_GET_ARG3(answer));
                 fibril_rwlock_write_unlock(&file->node->contents_rwlock);
         }
@@ -975 +938 @@
     fs_index_t index, aoff64_t size)
 {
-        sysarg_t rc;
-        int fs_phone;
-        
-        fs_phone = vfs_grab_phone(fs_handle);
-        rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (sysarg_t) devmap_handle,
-            (sysarg_t) index, LOWER32(size), UPPER32(size));
-        vfs_release_phone(fs_handle, fs_phone);
-        return (int)rc;
+        async_exch_t *exch = vfs_exchange_grab(fs_handle);
+        sysarg_t rc = async_req_4_0(exch, VFS_OUT_TRUNCATE,
+            (sysarg_t) devmap_handle, (sysarg_t) index, LOWER32(size),
+            UPPER32(size));
+        vfs_exchange_release(exch);
+        
+        return (int) rc;
 }
 
@@ -1032 +994 @@
         fibril_mutex_lock(&file->lock);
 
-        int fs_phone = vfs_grab_phone(file->node->fs_handle);
+        async_exch_t *exch = vfs_exchange_grab(file->node->fs_handle);
         
         aid_t msg;
-        msg = async_send_3(fs_phone, VFS_OUT_STAT, file->node->devmap_handle,
+        msg = async_send_3(exch, VFS_OUT_STAT, file->node->devmap_handle,
             file->node->index, true, NULL);
-        async_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+        async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+        
+        vfs_exchange_release(exch);
+        
         async_wait_for(msg, &rc);
-        vfs_release_phone(file->node->fs_handle, fs_phone);
-
+        
         fibril_mutex_unlock(&file->lock);
         vfs_file_put(file);
@@ -1083 +1047 @@
         fibril_rwlock_read_unlock(&namespace_rwlock);
 
-        int fs_phone = vfs_grab_phone(node->fs_handle);
+        async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
+        
         aid_t msg;
-        msg = async_send_3(fs_phone, VFS_OUT_STAT, node->devmap_handle,
+        msg = async_send_3(exch, VFS_OUT_STAT, node->devmap_handle,
             node->index, false, NULL);
-        async_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+        async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+        
+        vfs_exchange_release(exch);
         
         sysarg_t rv;
         async_wait_for(msg, &rv);
-        vfs_release_phone(node->fs_handle, fs_phone);
 
         async_answer_0(rid, rv);
@@ -1369 +1335 @@
         fibril_mutex_lock(&oldfile->lock);
         
-        /* Lookup an open file structure possibly corresponding to newfd. */
-        vfs_file_t *newfile = vfs_file_get(newfd);
-        if (newfile) {
-                /* Close the originally opened file. */
-                int ret = vfs_close_internal(newfile);
-                if (ret != EOK) {
-                        fibril_mutex_unlock(&oldfile->lock);
-                        vfs_file_put(oldfile);
-                        vfs_file_put(newfile);
-                        async_answer_0(rid, ret);
-                        return;
-                }
-                
-                ret = vfs_fd_free(newfd);
-                if (ret != EOK) {
-                        fibril_mutex_unlock(&oldfile->lock);
-                        vfs_file_put(oldfile);
-                        vfs_file_put(newfile);
-                        async_answer_0(rid, ret);
-                        return;
-                }
-                vfs_file_put(newfile);
-        }
+        /* Make sure newfd is closed. */
+        (void) vfs_fd_free(newfd);
         
         /* Assign the old file to newfd. */