Changeset 4198f9c3 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2009-06-28T13:43:15Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

852b801

Parents:

6408be3

Message:

Separate the VFS input and output protocols.

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -109 +109 @@
                 /*
                  * Now we hold a reference to mp_node.
-                 * It will be dropped upon the corresponding VFS_UNMOUNT.
+                 * It will be dropped upon the corresponding VFS_IN_UNMOUNT.
                  * This prevents the mount point from being deleted.
                  */
@@ -122 +122 @@
                         /* Tell the mountee that it is being mounted. */
                         phone = vfs_grab_phone(fs_handle);
-                        msg = async_send_1(phone, VFS_MOUNTED,
+                        msg = async_send_1(phone, VFS_OUT_MOUNTED,
                             (ipcarg_t) dev_handle, &answer);
                         /* send the mount options */
@@ -184 +184 @@
 
         phone = vfs_grab_phone(mp_res.triplet.fs_handle);
-        msg = async_send_4(phone, VFS_MOUNT,
+        msg = async_send_4(phone, VFS_OUT_MOUNT,
             (ipcarg_t) mp_res.triplet.dev_handle,
             (ipcarg_t) mp_res.triplet.index,
@@ -438 +438 @@
         /*
          * The POSIX interface is open(path, oflag, mode).
-         * We can receive oflags and mode along with the VFS_OPEN call; the path
-         * will need to arrive in another call.
+         * We can receive oflags and mode along with the VFS_IN_OPEN call;
+         * the path will need to arrive in another call.
          *
          * We also receive one private, non-POSIX set of flags called lflag
@@ -556 +556 @@
          * It is necessary so that the file will not disappear when
          * vfs_node_put() is called. The reference will be dropped by the
-         * respective VFS_CLOSE.
+         * respective VFS_IN_CLOSE.
          */
         vfs_node_addref(node);
@@ -633 +633 @@
          * It is necessary so that the file will not disappear when
          * vfs_node_put() is called. The reference will be dropped by the
-         * respective VFS_CLOSE.
+         * respective VFS_IN_CLOSE.
          */
         vfs_node_addref(node);
@@ -675 +675 @@
         int fs_phone = vfs_grab_phone(file->node->fs_handle);
         
-        /* Make a VFS_DEVICE request at the destination FS server. */
+        /* Make a VFS_OUT_DEVICE request at the destination FS server. */
         aid_t msg;
         ipc_call_t answer;
-        msg = async_send_2(fs_phone, IPC_GET_METHOD(*request),
-            file->node->dev_handle, file->node->index, &answer);
+        msg = async_send_2(fs_phone, VFS_OUT_DEVICE, file->node->dev_handle,
+            file->node->index, &answer);
 
         /* Wait for reply from the FS server. */
@@ -709 +709 @@
         int fs_phone = vfs_grab_phone(file->node->fs_handle);
         
-        /* Make a VFS_SYMC request at the destination FS server. */
+        /* Make a VFS_OUT_SYMC request at the destination FS server. */
         aid_t msg;
         ipc_call_t answer;
-        msg = async_send_2(fs_phone, IPC_GET_METHOD(*request),
-            file->node->dev_handle, file->node->index, &answer);
+        msg = async_send_2(fs_phone, VFS_OUT_SYNC, file->node->dev_handle,
+            file->node->index, &answer);
 
         /* Wait for reply from the FS server. */
@@ -743 +743 @@
         int fs_phone = vfs_grab_phone(file->node->fs_handle);
         
-        /* Make a VFS_CLOSE request at the destination FS server. */
+        /* Make a VFS_OUT_CLOSE request at the destination FS server. */
         aid_t msg;
         ipc_call_t answer;
-        msg = async_send_2(fs_phone, IPC_GET_METHOD(*request),
-            file->node->dev_handle, file->node->index, &answer);
+        msg = async_send_2(fs_phone, VFS_OUT_CLOSE, file->node->dev_handle,
+            file->node->index, &answer);
 
         /* Wait for reply from the FS server. */
@@ -833 +833 @@
         if (!read && file->append)
                 file->pos = file->node->size;
-        msg = async_send_3(fs_phone, IPC_GET_METHOD(*request),
+        msg = async_send_3(fs_phone, read ? VFS_OUT_READ : VFS_OUT_WRITE,
             file->node->dev_handle, file->node->index, file->pos, &answer);
         
@@ -947 +947 @@
         
         fs_phone = vfs_grab_phone(fs_handle);
-        rc = async_req_3_0(fs_phone, VFS_TRUNCATE, (ipcarg_t)dev_handle,
+        rc = async_req_3_0(fs_phone, VFS_OUT_TRUNCATE, (ipcarg_t)dev_handle,
             (ipcarg_t)index, (ipcarg_t)size);
         vfs_release_phone(fs_phone);
@@ -1051 +1051 @@
          * The name has already been unlinked by vfs_lookup_internal().
          * We have to get and put the VFS node to ensure that it is
-         * VFS_DESTROY'ed after the last reference to it is dropped.
+         * VFS_OUT_DESTROY'ed after the last reference to it is dropped.
          */
         vfs_node_t *node = vfs_node_get(&lr);