Changeset 12fc042 in mainline

Timestamp:

2008-08-09T09:45:02Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

11c2ae5

Parents:

c544c5d

Message:

Fix the VFS protocol so that the client can determine that VFS_MOUNT failed due
to a request to mount an unregistered file system.

Location:

uspace

Files:

• lib/libc/generic/vfs/vfs.c (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (4 diffs)

uspace/lib/libc/generic/vfs/vfs.c

@@ -173 +173 @@
                 return (int) rc;
         }
+        /* Ask VFS whether it likes fs_name. */
+        rc = async_req_0_0(vfs_phone, IPC_M_PING);
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                futex_up(&vfs_phone_futex);
+                free(mpa);
+                return (int) rc;
+        }
         rc = ipc_data_write_start(vfs_phone, (void *)mpa, mpa_len);
         if (rc != EOK) {

uspace/srv/vfs/vfs_ops.c

@@ -72 +72 @@
         dev_handle_t dev_handle;
         vfs_node_t *mp_node = NULL;
+        ipc_callid_t callid;
+        ipc_call_t data;
         int rc;
         int phone;
+        size_t size;
 
         /*
@@ -86 +89 @@
          * carry mount options in the future.
          */
-
-        ipc_callid_t callid;
-        size_t size;
 
         /*
@@ -116 +116 @@
         
         /*
+         * Wait for IPC_M_PING so that we can return an error if we don't know
+         * fs_name.
+         */
+        callid = async_get_call(&data);
+        if (IPC_GET_METHOD(data) != IPC_M_PING) {
+                ipc_answer_0(callid, ENOTSUP);
+                ipc_answer_0(rid, ENOTSUP);
+                return;
+        }
+
+        /*
          * Check if we know a file system with the same name as is in fs_name.
          * This will also give us its file system handle.
@@ -121 +132 @@
         fs_handle_t fs_handle = fs_name_to_handle(fs_name, true);
         if (!fs_handle) {
+                ipc_answer_0(callid, ENOENT);
                 ipc_answer_0(rid, ENOENT);
                 return;
         }
+
+        /* Acknowledge that we know fs_name. */
+        ipc_answer_0(callid, EOK);
 
         /* Now, we want the client to send us the mount point. */