Changes in uspace/srv/vfs/vfs_ops.c [5bb9907:ccca251] 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;
-        aoff64_t rsize;
+        size_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. */
-                        exch = vfs_exchange_grab(fs_handle);
-                        msg = async_send_1(exch, VFS_OUT_MOUNTED,
+                        phone = vfs_grab_phone(fs_handle);
+                        msg = async_send_1(phone, VFS_OUT_MOUNTED,
                             (sysarg_t) devmap_handle, &answer);
-                        /* Send the mount options */
-                        rc = async_data_write_start(exch, (void *)opts,
+                        /* send the mount options */
+                        rc = async_data_write_start(phone, (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);
@@ -138 +137 @@
                         }
                         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 = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
-                        rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
+                        rsize = (size_t) IPC_GET_ARG2(answer);
+                        rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
                         
                         mr_res.triplet.fs_handle = fs_handle;
@@ -182 +182 @@
          */
         
-        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,
+        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,
             (sysarg_t) mp_res.triplet.devmap_handle,
             (sysarg_t) mp_res.triplet.index,
@@ -192 +192 @@
             (sysarg_t) devmap_handle, &answer);
         
-        /* Send connection */
-        rc = async_exchange_clone(exch, mountee_exch);
-        vfs_exchange_release(mountee_exch);
-        
-        if (rc != EOK) {
-                vfs_exchange_release(exch);
+        /* send connection */
+        rc = async_req_1_0(phone, IPC_M_CONNECTION_CLONE, mountee_phone);
+        if (rc != EOK) {
                 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);
         
         /* send the mount options */
-        rc = async_data_write_start(exch, (void *) opts, str_size(opts));
-        if (rc != EOK) {
-                vfs_exchange_release(exch);
+        rc = async_data_write_start(phone, (void *)opts, str_size(opts));
+        if (rc != EOK) {
                 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;
         }
-        
-        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 = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
-                    IPC_GET_ARG3(answer));
-                rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
-                
+                rsize = (size_t) IPC_GET_ARG2(answer);
+                rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
+        
                 mr_res.triplet.fs_handle = fs_handle;
                 mr_res.triplet.devmap_handle = devmap_handle;
@@ -239 +234 @@
                 mr_res.lnkcnt = rlnkcnt;
                 mr_res.type = VFS_NODE_DIRECTORY;
-                
+        
                 /* Add reference to the mounted root. */
                 mr_node = vfs_node_get(&mr_res); 
@@ -248 +243 @@
                         vfs_node_put(mp_node);
         }
-        
+
         async_answer_0(rid, rc);
         fibril_rwlock_write_unlock(&namespace_rwlock);
@@ -308 +303 @@
         
         /*
-         * Wait for VFS_IN_PING so that we can return an error if we don't know
+         * Wait for IPC_M_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) != VFS_IN_PING) {
+        if (IPC_GET_IMETHOD(data) != IPC_M_PING) {
                 async_answer_0(callid, ENOTSUP);
                 async_answer_0(rid, ENOTSUP);
@@ -326 +321 @@
          * This will also give us its file system handle.
          */
-        fibril_mutex_lock(&fs_list_lock);
+        fibril_mutex_lock(&fs_head_lock);
         fs_handle_t fs_handle;
 recheck:
@@ -332 +327 @@
         if (!fs_handle) {
                 if (flags & IPC_FLAG_BLOCKING) {
-                        fibril_condvar_wait(&fs_list_cv, &fs_list_lock);
+                        fibril_condvar_wait(&fs_head_cv, &fs_head_lock);
                         goto recheck;
                 }
                 
-                fibril_mutex_unlock(&fs_list_lock);
+                fibril_mutex_unlock(&fs_head_lock);
                 async_answer_0(callid, ENOENT);
                 async_answer_0(rid, ENOENT);
@@ -344 +339 @@
                 return;
         }
-        fibril_mutex_unlock(&fs_list_lock);
+        fibril_mutex_unlock(&fs_head_lock);
         
         /* Acknowledge that we know fs_name. */
@@ -363 +358 @@
         vfs_lookup_res_t mr_res;
         vfs_node_t *mr_node;
-        async_exch_t *exch;
-        
+        int phone;
+
         /*
          * Receive the mount point path.
@@ -372 +367 @@
         if (rc != EOK)
                 async_answer_0(rid, rc);
-        
+
         /*
          * Taking the namespace lock will do two things for us. First, it will
@@ -400 +395 @@
                 return;
         }
-        
+
         /*
          * Count the total number of references for the mounted file system. We
@@ -416 +411 @@
                 return;
         }
-        
+
         if (str_cmp(mp, "/") == 0) {
-                
+
                 /*
                  * Unmounting the root file system.
@@ -425 +420 @@
                  * VFS_OUT_UNMOUNTED directly to the mounted file system.
                  */
-                
+
                 free(mp);
-                
-                exch = vfs_exchange_grab(mr_node->fs_handle);
-                rc = async_req_1_0(exch, VFS_OUT_UNMOUNTED,
+                phone = vfs_grab_phone(mr_node->fs_handle);
+                rc = async_req_1_0(phone, VFS_OUT_UNMOUNTED,
                     mr_node->devmap_handle);
-                vfs_exchange_release(exch);
-                
+                vfs_release_phone(mr_node->fs_handle, phone);
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
@@ -439 +432 @@
                         return;
                 }
-                
                 rootfs.fs_handle = 0;
                 rootfs.devmap_handle = 0;
         } else {
-                
+
                 /*
                  * Unmounting a non-root file system.
@@ -450 +442 @@
                  * file system, so we delegate the operation to it.
                  */
-                
+
                 rc = vfs_lookup_internal(mp, L_MP, &mp_res, NULL);
                 free(mp);
@@ -459 +451 @@
                         return;
                 }
-                
                 vfs_node_t *mp_node = vfs_node_get(&mp_res);
                 if (!mp_node) {
@@ -467 +458 @@
                         return;
                 }
-                
-                exch = vfs_exchange_grab(mp_node->fs_handle);
-                rc = async_req_2_0(exch, VFS_OUT_UNMOUNT,
+
+                phone = vfs_grab_phone(mp_node->fs_handle);
+                rc = async_req_2_0(phone, VFS_OUT_UNMOUNT,
                     mp_node->devmap_handle, mp_node->index);
-                vfs_exchange_release(exch);
-                
+                vfs_release_phone(mp_node->fs_handle, phone);
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
@@ -480 +470 @@
                         return;
                 }
-                
+
                 /* Drop the reference we got above. */
                 vfs_node_put(mp_node);
@@ -486 +476 @@
                 vfs_node_put(mp_node);
         }
-        
+
+
         /*
          * All went well, the mounted file system was successfully unmounted.
@@ -492 +483 @@
          */
         vfs_node_forget(mr_node);
-        
+
         fibril_rwlock_write_unlock(&namespace_rwlock);
         async_answer_0(rid, EOK);
@@ -707 +698 @@
          */
         fibril_mutex_lock(&file->lock);
-        async_exch_t *fs_exch = vfs_exchange_grab(file->node->fs_handle);
+        int fs_phone = vfs_grab_phone(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_exch, VFS_OUT_SYNC, file->node->devmap_handle,
+        msg = async_send_2(fs_phone, 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);
-        int ret = vfs_fd_free(fd);
+        
+        /* 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);
         async_answer_0(rid, ret);
 }
@@ -736 +774 @@
 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
@@ -745 +785 @@
          * open files supports parallel access!
          */
-        
+
         int fd = IPC_GET_ARG1(*request);
         
@@ -760 +800 @@
          */
         fibril_mutex_lock(&file->lock);
-        
-        vfs_info_t *fs_info = fs_handle_to_info(file->node->fs_handle);
-        assert(fs_info);
-        
+
+        vi = fs_handle_to_info(file->node->fs_handle);
+        assert(vi);
+
         /*
          * Lock the file's node so that no other client can read/write to it at
@@ -769 +809 @@
          * write implementation does not modify the file size.
          */
-        if ((read) ||
-            ((fs_info->concurrent_read_write) && (fs_info->write_retains_size)))
+        if (read || (vi->concurrent_read_write && vi->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) {
                 /*
@@ -784 +823 @@
         }
         
-        async_exch_t *fs_exch = vfs_exchange_grab(file->node->fs_handle);
+        int fs_phone = vfs_grab_phone(file->node->fs_handle);
         
         /*
@@ -796 +835 @@
         ipc_call_t answer;
         if (read) {
-                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);
+                rc = async_data_read_forward_3_1(fs_phone, VFS_OUT_READ,
+                    file->node->devmap_handle, file->node->index, file->pos,
+                    &answer);
         } else {
                 if (file->append)
                         file->pos = file->node->size;
                 
-                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);
+                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);
         
         size_t bytes = IPC_GET_ARG1(answer);
@@ -816 +855 @@
         
         /* Unlock the VFS node. */
-        if ((read) ||
-            ((fs_info->concurrent_read_write) && (fs_info->write_retains_size)))
+        if (read || (vi->concurrent_read_write && vi->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 = MERGE_LOUP32(IPC_GET_ARG2(answer),
-                            IPC_GET_ARG3(answer));
+                        file->node->size = IPC_GET_ARG2(answer); 
                 fibril_rwlock_write_unlock(&file->node->contents_rwlock);
         }
@@ -938 +975 @@
     fs_index_t index, aoff64_t size)
 {
-        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;
+        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;
 }
 
@@ -994 +1032 @@
         fibril_mutex_lock(&file->lock);
 
-        async_exch_t *exch = vfs_exchange_grab(file->node->fs_handle);
+        int fs_phone = vfs_grab_phone(file->node->fs_handle);
         
         aid_t msg;
-        msg = async_send_3(exch, VFS_OUT_STAT, file->node->devmap_handle,
+        msg = async_send_3(fs_phone, VFS_OUT_STAT, file->node->devmap_handle,
             file->node->index, true, NULL);
-        async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
-        
-        vfs_exchange_release(exch);
-        
+        async_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
         async_wait_for(msg, &rc);
-        
+        vfs_release_phone(file->node->fs_handle, fs_phone);
+
         fibril_mutex_unlock(&file->lock);
         vfs_file_put(file);
@@ -1047 +1083 @@
         fibril_rwlock_read_unlock(&namespace_rwlock);
 
-        async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
-        
+        int fs_phone = vfs_grab_phone(node->fs_handle);
         aid_t msg;
-        msg = async_send_3(exch, VFS_OUT_STAT, node->devmap_handle,
+        msg = async_send_3(fs_phone, VFS_OUT_STAT, node->devmap_handle,
             node->index, false, NULL);
-        async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
-        
-        vfs_exchange_release(exch);
+        async_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
         
         sysarg_t rv;
         async_wait_for(msg, &rv);
+        vfs_release_phone(node->fs_handle, fs_phone);
 
         async_answer_0(rid, rv);
@@ -1335 +1369 @@
         fibril_mutex_lock(&oldfile->lock);
         
-        /* Make sure newfd is closed. */
-        (void) vfs_fd_free(newfd);
+        /* 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);
+        }
         
         /* Assign the old file to newfd. */