Changes in uspace/srv/vfs/vfs_ops.c [27b76ca:c69646f8] in mainline

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -54 +54 @@
 
 /* Forward declarations of static functions. */
-static int vfs_truncate_internal(fs_handle_t, devmap_handle_t, fs_index_t,
+static int vfs_truncate_internal(fs_handle_t, service_id_t, fs_index_t,
     aoff64_t);
 
@@ -65 +65 @@
 vfs_pair_t rootfs = {
         .fs_handle = 0,
-        .devmap_handle = 0
+        .service_id = 0
 };
 
-static void vfs_mount_internal(ipc_callid_t rid, devmap_handle_t devmap_handle,
+static void vfs_mount_internal(ipc_callid_t rid, service_id_t service_id,
     fs_handle_t fs_handle, char *mp, char *opts)
 {
@@ -125 +125 @@
                         exch = vfs_exchange_grab(fs_handle);
                         msg = async_send_1(exch, VFS_OUT_MOUNTED,
-                            (sysarg_t) devmap_handle, &answer);
+                            (sysarg_t) service_id, &answer);
                         /* Send the mount options */
                         rc = async_data_write_start(exch, (void *)opts,
@@ -150 +150 @@
                         
                         mr_res.triplet.fs_handle = fs_handle;
-                        mr_res.triplet.devmap_handle = devmap_handle;
+                        mr_res.triplet.service_id = service_id;
                         mr_res.triplet.index = rindex;
                         mr_res.size = rsize;
@@ -157 +157 @@
                         
                         rootfs.fs_handle = fs_handle;
-                        rootfs.devmap_handle = devmap_handle;
+                        rootfs.service_id = service_id;
                         
                         /* Add reference to the mounted root. */
@@ -178 +178 @@
         
         /*
-         * At this point, we have all necessary pieces: file system and device
-         * handles, and we know the mount point VFS node.
+         * At this point, we have all necessary pieces: file system handle
+         * and service ID, and we know the mount point VFS node.
          */
         
@@ -187 +187 @@
         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.service_id,
             (sysarg_t) mp_res.triplet.index,
             (sysarg_t) fs_handle,
-            (sysarg_t) devmap_handle, &answer);
+            (sysarg_t) service_id, &answer);
         
         /* Send connection */
@@ -224 +224 @@
         }
         
+        /*
+         * Wait for the answer before releasing the exchange to avoid deadlock
+         * in case the answer depends on further calls to the same file system.
+         * Think of a case when mounting a FS on a file_bd backed by a file on
+         * the same FS. 
+         */
+        async_wait_for(msg, &rc);
         vfs_exchange_release(exch);
-        async_wait_for(msg, &rc);
         
         if (rc == EOK) {
@@ -234 +240 @@
                 
                 mr_res.triplet.fs_handle = fs_handle;
-                mr_res.triplet.devmap_handle = devmap_handle;
+                mr_res.triplet.service_id = service_id;
                 mr_res.triplet.index = rindex;
                 mr_res.size = rsize;
@@ -255 +261 @@
 void vfs_mount(ipc_callid_t rid, ipc_call_t *request)
 {
-        devmap_handle_t devmap_handle;
+        service_id_t service_id;
 
         /*
@@ -262 +268 @@
          * in the request.
          */
-        devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
+        service_id = (service_id_t) IPC_GET_ARG1(*request);
         
         /*
@@ -350 +356 @@
         
         /* Do the mount */
-        vfs_mount_internal(rid, devmap_handle, fs_handle, mp, opts);
+        vfs_mount_internal(rid, service_id, fs_handle, mp, opts);
         free(mp);
         free(fs_name);
@@ -409 +415 @@
          */
         if (vfs_nodes_refcount_sum_get(mr_node->fs_handle,
-            mr_node->devmap_handle) != 2) {
+            mr_node->service_id) != 2) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
                 vfs_node_put(mr_node);
@@ -430 +436 @@
                 exch = vfs_exchange_grab(mr_node->fs_handle);
                 rc = async_req_1_0(exch, VFS_OUT_UNMOUNTED,
-                    mr_node->devmap_handle);
+                    mr_node->service_id);
                 vfs_exchange_release(exch);
                 
@@ -441 +447 @@
                 
                 rootfs.fs_handle = 0;
-                rootfs.devmap_handle = 0;
+                rootfs.service_id = 0;
         } else {
                 
@@ -470 +476 @@
                 exch = vfs_exchange_grab(mp_node->fs_handle);
                 rc = async_req_2_0(exch, VFS_OUT_UNMOUNT,
-                    mp_node->devmap_handle, mp_node->index);
+                    mp_node->service_id, mp_node->index);
                 vfs_exchange_release(exch);
                 
@@ -575 +581 @@
                 if (node->size) {
                         rc = vfs_truncate_internal(node->fs_handle,
-                            node->devmap_handle, node->index, 0);
+                            node->service_id, node->index, 0);
                         if (rc) {
                                 fibril_rwlock_write_unlock(&node->contents_rwlock);
@@ -639 +645 @@
         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_exch, VFS_OUT_SYNC, file->node->service_id,
             file->node->index, &answer);
         
@@ -724 +730 @@
         if (read) {
                 rc = async_data_read_forward_4_1(fs_exch, VFS_OUT_READ,
-                    file->node->devmap_handle, file->node->index,
+                    file->node->service_id, file->node->index,
                     LOWER32(file->pos), UPPER32(file->pos), &answer);
         } else {
@@ -731 +737 @@
                 
                 rc = async_data_write_forward_4_1(fs_exch, VFS_OUT_WRITE,
-                    file->node->devmap_handle, file->node->index,
+                    file->node->service_id, file->node->index,
                     LOWER32(file->pos), UPPER32(file->pos), &answer);
         }
@@ -862 +868 @@
 }
 
-int vfs_truncate_internal(fs_handle_t fs_handle, devmap_handle_t devmap_handle,
+int vfs_truncate_internal(fs_handle_t fs_handle, service_id_t service_id,
     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),
+            (sysarg_t) service_id, (sysarg_t) index, LOWER32(size),
             UPPER32(size));
         vfs_exchange_release(exch);
@@ -890 +896 @@
         fibril_rwlock_write_lock(&file->node->contents_rwlock);
         rc = vfs_truncate_internal(file->node->fs_handle,
-            file->node->devmap_handle, file->node->index, size);
+            file->node->service_id, file->node->index, size);
         if (rc == EOK)
                 file->node->size = size;
@@ -924 +930 @@
         
         aid_t msg;
-        msg = async_send_3(exch, VFS_OUT_STAT, file->node->devmap_handle,
+        msg = async_send_3(exch, VFS_OUT_STAT, file->node->service_id,
             file->node->index, true, NULL);
         async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
@@ -977 +983 @@
         
         aid_t msg;
-        msg = async_send_3(exch, VFS_OUT_STAT, node->devmap_handle,
+        msg = async_send_3(exch, VFS_OUT_STAT, node->service_id,
             node->index, false, NULL);
         async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
@@ -1154 +1160 @@
         /* Check whether linking to the same file system instance. */
         if ((old_node->fs_handle != new_par_lr.triplet.fs_handle) ||
-            (old_node->devmap_handle != new_par_lr.triplet.devmap_handle)) {
+            (old_node->service_id != new_par_lr.triplet.service_id)) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
                 vfs_node_put(old_node);