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

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -54 +54 @@
 
 /* Forward declarations of static functions. */
-static int vfs_truncate_internal(fs_handle_t, service_id_t, fs_index_t,
+static int vfs_truncate_internal(fs_handle_t, devmap_handle_t, fs_index_t,
     aoff64_t);
 
@@ -65 +65 @@
 vfs_pair_t rootfs = {
         .fs_handle = 0,
-        .service_id = 0
+        .devmap_handle = 0
 };
 
-static void vfs_mount_internal(ipc_callid_t rid, service_id_t service_id,
+static void vfs_mount_internal(ipc_callid_t rid, devmap_handle_t devmap_handle,
     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) service_id, &answer);
+                            (sysarg_t) devmap_handle, &answer);
                         /* Send the mount options */
                         rc = async_data_write_start(exch, (void *)opts,
@@ -146 +146 @@
 
                         rindex = (fs_index_t) IPC_GET_ARG1(answer);
-                        rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
-                            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.service_id = service_id;
+                        mr_res.triplet.devmap_handle = devmap_handle;
                         mr_res.triplet.index = rindex;
                         mr_res.size = rsize;
@@ -158 +157 @@
                         
                         rootfs.fs_handle = fs_handle;
-                        rootfs.service_id = service_id;
+                        rootfs.devmap_handle = devmap_handle;
                         
                         /* Add reference to the mounted root. */
@@ -179 +178 @@
         
         /*
-         * At this point, we have all necessary pieces: file system handle
-         * and service ID, and we know the mount point VFS node.
+         * At this point, we have all necessary pieces: file system and device
+         * handles, and we know the mount point VFS node.
          */
         
@@ -188 +187 @@
         exch = vfs_exchange_grab(mp_res.triplet.fs_handle);
         msg = async_send_4(exch, VFS_OUT_MOUNT,
-            (sysarg_t) mp_res.triplet.service_id,
+            (sysarg_t) mp_res.triplet.devmap_handle,
             (sysarg_t) mp_res.triplet.index,
             (sysarg_t) fs_handle,
-            (sysarg_t) service_id, &answer);
+            (sysarg_t) devmap_handle, &answer);
         
         /* Send connection */
@@ -225 +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. 
-         */
+        vfs_exchange_release(exch);
         async_wait_for(msg, &rc);
-        vfs_exchange_release(exch);
         
         if (rc == EOK) {
@@ -241 +234 @@
                 
                 mr_res.triplet.fs_handle = fs_handle;
-                mr_res.triplet.service_id = service_id;
+                mr_res.triplet.devmap_handle = devmap_handle;
                 mr_res.triplet.index = rindex;
                 mr_res.size = rsize;
@@ -262 +255 @@
 void vfs_mount(ipc_callid_t rid, ipc_call_t *request)
 {
-        service_id_t service_id;
+        devmap_handle_t devmap_handle;
 
         /*
@@ -269 +262 @@
          * in the request.
          */
-        service_id = (service_id_t) IPC_GET_ARG1(*request);
+        devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
         
         /*
@@ -277 +270 @@
         
         /*
-         * Instance number is passed as ARG3.
-         */
-        unsigned int instance = IPC_GET_ARG3(*request);
-
+         * For now, don't make use of ARG3, but it can be used to
+         * carry mount options in the future.
+         */
+        
         /* We want the client to send us the mount point. */
         char *mp;
@@ -336 +329 @@
         fs_handle_t fs_handle;
 recheck:
-        fs_handle = fs_name_to_handle(instance, fs_name, false);
+        fs_handle = fs_name_to_handle(fs_name, false);
         if (!fs_handle) {
                 if (flags & IPC_FLAG_BLOCKING) {
@@ -357 +350 @@
         
         /* Do the mount */
-        vfs_mount_internal(rid, service_id, fs_handle, mp, opts);
+        vfs_mount_internal(rid, devmap_handle, fs_handle, mp, opts);
         free(mp);
         free(fs_name);
@@ -416 +409 @@
          */
         if (vfs_nodes_refcount_sum_get(mr_node->fs_handle,
-            mr_node->service_id) != 2) {
+            mr_node->devmap_handle) != 2) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
                 vfs_node_put(mr_node);
@@ -437 +430 @@
                 exch = vfs_exchange_grab(mr_node->fs_handle);
                 rc = async_req_1_0(exch, VFS_OUT_UNMOUNTED,
-                    mr_node->service_id);
+                    mr_node->devmap_handle);
                 vfs_exchange_release(exch);
                 
@@ -448 +441 @@
                 
                 rootfs.fs_handle = 0;
-                rootfs.service_id = 0;
+                rootfs.devmap_handle = 0;
         } else {
                 
@@ -477 +470 @@
                 exch = vfs_exchange_grab(mp_node->fs_handle);
                 rc = async_req_2_0(exch, VFS_OUT_UNMOUNT,
-                    mp_node->service_id, mp_node->index);
+                    mp_node->devmap_handle, mp_node->index);
                 vfs_exchange_release(exch);
                 
@@ -582 +575 @@
                 if (node->size) {
                         rc = vfs_truncate_internal(node->fs_handle,
-                            node->service_id, node->index, 0);
+                            node->devmap_handle, node->index, 0);
                         if (rc) {
                                 fibril_rwlock_write_unlock(&node->contents_rwlock);
@@ -646 +639 @@
         aid_t msg;
         ipc_call_t answer;
-        msg = async_send_2(fs_exch, VFS_OUT_SYNC, file->node->service_id,
+        msg = async_send_2(fs_exch, VFS_OUT_SYNC, file->node->devmap_handle,
             file->node->index, &answer);
         
@@ -731 +724 @@
         if (read) {
                 rc = async_data_read_forward_4_1(fs_exch, VFS_OUT_READ,
-                    file->node->service_id, file->node->index,
+                    file->node->devmap_handle, file->node->index,
                     LOWER32(file->pos), UPPER32(file->pos), &answer);
         } else {
@@ -738 +731 @@
                 
                 rc = async_data_write_forward_4_1(fs_exch, VFS_OUT_WRITE,
-                    file->node->service_id, file->node->index,
+                    file->node->devmap_handle, file->node->index,
                     LOWER32(file->pos), UPPER32(file->pos), &answer);
         }
@@ -869 +862 @@
 }
 
-int vfs_truncate_internal(fs_handle_t fs_handle, service_id_t service_id,
+int vfs_truncate_internal(fs_handle_t fs_handle, devmap_handle_t devmap_handle,
     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) service_id, (sysarg_t) index, LOWER32(size),
+            (sysarg_t) devmap_handle, (sysarg_t) index, LOWER32(size),
             UPPER32(size));
         vfs_exchange_release(exch);
@@ -897 +890 @@
         fibril_rwlock_write_lock(&file->node->contents_rwlock);
         rc = vfs_truncate_internal(file->node->fs_handle,
-            file->node->service_id, file->node->index, size);
+            file->node->devmap_handle, file->node->index, size);
         if (rc == EOK)
                 file->node->size = size;
@@ -931 +924 @@
         
         aid_t msg;
-        msg = async_send_3(exch, VFS_OUT_STAT, file->node->service_id,
+        msg = async_send_3(exch, 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);
@@ -984 +977 @@
         
         aid_t msg;
-        msg = async_send_3(exch, VFS_OUT_STAT, node->service_id,
+        msg = async_send_3(exch, VFS_OUT_STAT, node->devmap_handle,
             node->index, false, NULL);
         async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
@@ -1161 +1154 @@
         /* Check whether linking to the same file system instance. */
         if ((old_node->fs_handle != new_par_lr.triplet.fs_handle) ||
-            (old_node->service_id != new_par_lr.triplet.service_id)) {
+            (old_node->devmap_handle != new_par_lr.triplet.devmap_handle)) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
                 vfs_node_put(old_node);