Changeset c08c355 in mainline

Timestamp:

2009-04-18T13:37:59Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c259b9b

Parents:

58d7280

Message:

Make IPC_M_PING part of the VFS_MOUNT protocol again.

Location:

uspace

Files:

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

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

@@ -194 +194 @@
                 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;
+        }
         
         async_wait_for(req, &rc);

uspace/srv/vfs/vfs_ops.c

@@ -321 +321 @@
         }
         fs_name[size] = '\0';
-        
+
+        /*
+         * Wait for IPC_M_PING so that we can return an error if we don't know
+         * fs_name.
+         */
+        ipc_call_t data;
+        callid = async_get_call(&data);
+        if (IPC_GET_METHOD(data) != IPC_M_PING) {
+                ipc_answer_0(callid, ENOTSUP);
+                ipc_answer_0(rid, ENOTSUP);
+                free(mp);
+                free(fs_name);
+                return;
+        }
+
         /*
          * Check if we know a file system with the same name as is in fs_name.
@@ -329 +343 @@
         if (!fs_handle) {
                 if (flags & IPC_FLAG_BLOCKING) {
+                        pending_req_t *pr;
+
                         /* Blocking mount, add to pending list */
-                        pending_req_t *pr = (pending_req_t *) malloc(sizeof(pending_req_t));
+                        pr = (pending_req_t *) malloc(sizeof(pending_req_t));
                         if (!pr) {
                                 ipc_answer_0(callid, ENOMEM);