Changeset a0edf5f in mainline

Timestamp:

2007-09-16T11:02:33Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b006bfb8

Parents:

2b20947

Message:

VFS work.

Added mandatory VFS_LOOKUP

Handling of VFS_REGISTER request should be now more or less complete.
Added code that inserts the new fs_info structure into the list of registered
filesystems and creates a callback connection to the client FS.

Files:

• kernel/generic/include/ipc/ipc.h (modified) (2 diffs)
• uspace/srv/vfs/vfs.c (modified) (2 diffs)
• uspace/srv/vfs/vfs.h (modified) (2 diffs)

kernel/generic/include/ipc/ipc.h

@@ -103 +103 @@
  *
  * The protocol for negotiating is:
- * - sys_connect_to_me - sends a message IPC_M_CONNECTTOME
+ * - sys_connect_to_me - sends a message IPC_M_CONNECT_TO_ME
  * - sys_wait_for_call - upon receipt tries to allocate new phone
  *                       - if it fails, responds with ELIMIT
@@ -111 +111 @@
  *                       the call is accepted and the response is sent back.
  *                     - the allocated phoneid is passed to userspace 
- *                       (on the receiving sid) as ARG3 of the call.
+ *                       (on the receiving side) as ARG3 of the call.
  *                     - the caller obtains taskid of the called thread
  */

uspace/srv/vfs/vfs.c

@@ -86 +86 @@
                 return false;
         if (info->ops[IPC_METHOD_TO_VFS_OP(VFS_UNMOUNT)] != VFS_OP_DEFINED)
+                return false;
+        if (info->ops[IPC_METHOD_TO_VFS_OP(VFS_LOOKUP)] != VFS_OP_DEFINED)
                 return false;
         if (info->ops[IPC_METHOD_TO_VFS_OP(VFS_OPEN)] != VFS_OP_DEFINED)
@@ -193 +195 @@
                 }
         }
-        
-        /*
-         * TODO:
-         * 1. send the client the IPC_M_CONNECT_TO_ME call so that it makes a
-         *    callback connection.
-         * 2. add the fs_info into fs_head
-         */
+
+        /*
+         * Add fs_info to the list of registered FS's.
+         */
+        list_append(&fs_info->fs_link, &fs_head);
+
+        /*
+         * ACK receiving a properly formatted, non-duplicit vfs_info.
+         */
+        ipc_answer_fast(callid, EOK, 0, 0);
+        
+        /*
+         * Now we want the client to send us the IPC_M_CONNECT_TO_ME call so
+         * that a callback connection is created and we have a phone through
+         * which to forward VFS requests to it.
+         */
+        callid = async_get_call(&call);
+        if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
+                list_remove(&fs_info->fs_link);
+                futex_up(&fs_head_futex);
+                free(fs_info);
+                ipc_answer_fast(callid, EINVAL, 0, 0);
+                ipc_answer_fast(rid, EINVAL, 0, 0);
+                return;
+        }
+        fs_info->phone = IPC_GET_ARG3(call);
+        ipc_answer_fast(callid, EOK, 0, 0);
 
         futex_up(&fs_head_futex);
+
+        /*
+         * That was it. The FS has been registered.
+         */
+        ipc_answer_fast(rid, EOK, 0, 0);
 }
 

uspace/srv/vfs/vfs.h

@@ -44 +44 @@
         VFS_MOUNT,
         VFS_UNMOUNT,
+        VFS_LOOKUP,
         VFS_OPEN,
         VFS_CREATE,
@@ -84 +85 @@
         link_t fs_link;
         vfs_info_t vfs_info;
+        ipcarg_t phone;
 } fs_info_t;