Changeset cb569e6 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2010-11-18T21:58:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e5c7ba

Parents:

69e0d6d (diff), 45f04f8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -55 +55 @@
 
 /* Forward declarations of static functions. */
-static int vfs_truncate_internal(fs_handle_t, dev_handle_t, fs_index_t, aoff64_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,
-        .dev_handle = 0
+        .devmap_handle = 0
 };
 
-static void vfs_mount_internal(ipc_callid_t rid, dev_handle_t dev_handle,
+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 @@
                         phone = vfs_grab_phone(fs_handle);
                         msg = async_send_1(phone, VFS_OUT_MOUNTED,
-                            (ipcarg_t) dev_handle, &answer);
+                            (ipcarg_t) devmap_handle, &answer);
                         /* send the mount options */
                         rc = async_data_write_start(phone, (void *)opts,
@@ -150 +150 @@
                         
                         mr_res.triplet.fs_handle = fs_handle;
-                        mr_res.triplet.dev_handle = dev_handle;
+                        mr_res.triplet.devmap_handle = devmap_handle;
                         mr_res.triplet.index = rindex;
                         mr_res.size = rsize;
@@ -157 +157 @@
                         
                         rootfs.fs_handle = fs_handle;
-                        rootfs.dev_handle = dev_handle;
+                        rootfs.devmap_handle = devmap_handle;
                         
                         /* Add reference to the mounted root. */
@@ -187 +187 @@
         phone = vfs_grab_phone(mp_res.triplet.fs_handle);
         msg = async_send_4(phone, VFS_OUT_MOUNT,
-            (ipcarg_t) mp_res.triplet.dev_handle,
+            (ipcarg_t) mp_res.triplet.devmap_handle,
             (ipcarg_t) mp_res.triplet.index,
             (ipcarg_t) fs_handle,
-            (ipcarg_t) dev_handle, &answer);
+            (ipcarg_t) devmap_handle, &answer);
         
         /* send connection */
@@ -229 +229 @@
         
                 mr_res.triplet.fs_handle = fs_handle;
-                mr_res.triplet.dev_handle = dev_handle;
+                mr_res.triplet.devmap_handle = devmap_handle;
                 mr_res.triplet.index = rindex;
                 mr_res.size = rsize;
@@ -255 +255 @@
          * in the request.
          */
-        dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+        devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
         
         /*
@@ -343 +343 @@
         
         /* Do the mount */
-        vfs_mount_internal(rid, dev_handle, fs_handle, mp, opts);
+        vfs_mount_internal(rid, devmap_handle, fs_handle, mp, opts);
         free(mp);
         free(fs_name);
@@ -402 +402 @@
          */
         if (vfs_nodes_refcount_sum_get(mr_node->fs_handle,
-            mr_node->dev_handle) != 2) {
+            mr_node->devmap_handle) != 2) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
                 vfs_node_put(mr_node);
@@ -422 +422 @@
                 phone = vfs_grab_phone(mr_node->fs_handle);
                 rc = async_req_1_0(phone, VFS_OUT_UNMOUNTED,
-                    mr_node->dev_handle);
+                    mr_node->devmap_handle);
                 vfs_release_phone(mr_node->fs_handle, phone);
                 if (rc != EOK) {
@@ -431 +431 @@
                 }
                 rootfs.fs_handle = 0;
-                rootfs.dev_handle = 0;
+                rootfs.devmap_handle = 0;
         } else {
 
@@ -458 +458 @@
 
                 phone = vfs_grab_phone(mp_node->fs_handle);
-                rc = async_req_2_0(phone, VFS_OUT_UNMOUNT, mp_node->dev_handle,
+                rc = async_req_2_0(phone, VFS_OUT_UNMOUNT, mp_node->devmap_handle,
                     mp_node->index);
                 vfs_release_phone(mp_node->fs_handle, phone);
@@ -569 +569 @@
                 if (node->size) {
                         rc = vfs_truncate_internal(node->fs_handle,
-                            node->dev_handle, node->index, 0);
+                            node->devmap_handle, node->index, 0);
                         if (rc) {
                                 fibril_rwlock_write_unlock(&node->contents_rwlock);
@@ -626 +626 @@
         
         lr.triplet.fs_handle = IPC_GET_ARG1(*request);
-        lr.triplet.dev_handle = IPC_GET_ARG2(*request);
+        lr.triplet.devmap_handle = IPC_GET_ARG2(*request);
         lr.triplet.index = IPC_GET_ARG3(*request);
         int oflag = IPC_GET_ARG4(*request);
@@ -647 +647 @@
                 if (node->size) {
                         rc = vfs_truncate_internal(node->fs_handle,
-                            node->dev_handle, node->index, 0);
+                            node->devmap_handle, node->index, 0);
                         if (rc) {
                                 fibril_rwlock_write_unlock(&node->contents_rwlock);
@@ -709 +709 @@
         aid_t msg;
         ipc_call_t answer;
-        msg = async_send_2(fs_phone, VFS_OUT_SYNC, file->node->dev_handle,
+        msg = async_send_2(fs_phone, VFS_OUT_SYNC, file->node->devmap_handle,
             file->node->index, &answer);
 
@@ -740 +740 @@
                 aid_t msg;
                 ipc_call_t answer;
-                msg = async_send_2(fs_phone, VFS_OUT_CLOSE, file->node->dev_handle,
+                msg = async_send_2(fs_phone, VFS_OUT_CLOSE, file->node->devmap_handle,
                     file->node->index, &answer);
                 
@@ -838 +838 @@
                 
                 rc = async_data_read_forward_3_1(fs_phone, VFS_OUT_READ,
-                    file->node->dev_handle, file->node->index, file->pos,
+                    file->node->devmap_handle, file->node->index, file->pos,
                     &answer);
         } else {
                 rc = async_data_write_forward_3_1(fs_phone, VFS_OUT_WRITE,
-                    file->node->dev_handle, file->node->index, file->pos,
+                    file->node->devmap_handle, file->node->index, file->pos,
                     &answer);
         }
@@ -961 +961 @@
 }
 
-int vfs_truncate_internal(fs_handle_t fs_handle, dev_handle_t dev_handle,
+int vfs_truncate_internal(fs_handle_t fs_handle, devmap_handle_t devmap_handle,
     fs_index_t index, aoff64_t size)
 {
@@ -968 +968 @@
         
         fs_phone = vfs_grab_phone(fs_handle);
-        rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (ipcarg_t) dev_handle,
+        rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (ipcarg_t) devmap_handle,
             (ipcarg_t) index, LOWER32(size), UPPER32(size));
         vfs_release_phone(fs_handle, fs_phone);
@@ -990 +990 @@
         fibril_rwlock_write_lock(&file->node->contents_rwlock);
         rc = vfs_truncate_internal(file->node->fs_handle,
-            file->node->dev_handle, file->node->index, size);
+            file->node->devmap_handle, file->node->index, size);
         if (rc == EOK)
                 file->node->size = size;
@@ -1022 +1022 @@
         
         aid_t msg;
-        msg = async_send_3(fs_phone, VFS_OUT_STAT, file->node->dev_handle,
+        msg = async_send_3(fs_phone, VFS_OUT_STAT, file->node->devmap_handle,
             file->node->index, true, NULL);
         ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
@@ -1071 +1071 @@
         int fs_phone = vfs_grab_phone(node->fs_handle);
         aid_t msg;
-        msg = async_send_3(fs_phone, VFS_OUT_STAT, node->dev_handle,
+        msg = async_send_3(fs_phone, VFS_OUT_STAT, node->devmap_handle,
             node->index, false, NULL);
         ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
@@ -1245 +1245 @@
         /* Check whether linking to the same file system instance. */
         if ((old_node->fs_handle != new_par_lr.triplet.fs_handle) ||
-            (old_node->dev_handle != new_par_lr.triplet.dev_handle)) {
+            (old_node->devmap_handle != new_par_lr.triplet.devmap_handle)) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
                 ipc_answer_0(rid, EXDEV);       /* different file systems */