Changeset f49b0ea in mainline for uspace/srv/fs/tmpfs

Timestamp:

2008-06-06T15:16:41Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cde485d

Parents:

f86c184

Message:

Split the 'mount another filesystem here' and 'you are being mounted and the
device is this' mount semantics. Add VFS_MOUNTED VFS operation that corresponds
to the latter and reserve VFS_MOUNT only for the former. Because of this
change, the VFS server does not maintain the mr_node VFS node for the name space
root anymore and the VFS_LOOKUP operation is now not meant to be used on
unmounted file system, not even for looking up the root node of unmounted file
systems. In the light of these changes, TMPFS is now initialized from
tmpfs_mounted() function.

Location:

uspace/srv/fs/tmpfs

Files:

• tmpfs.c (modified) (2 diffs)
• tmpfs.h (modified) (2 diffs)
• tmpfs_ops.c (modified) (2 diffs)

uspace/srv/fs/tmpfs/tmpfs.c

@@ -62 +62 @@
                 [IPC_METHOD_TO_VFS_OP(VFS_TRUNCATE)] = VFS_OP_DEFINED,
                 [IPC_METHOD_TO_VFS_OP(VFS_MOUNT)] = VFS_OP_DEFINED,
+                [IPC_METHOD_TO_VFS_OP(VFS_MOUNTED)] = VFS_OP_DEFINED,
                 [IPC_METHOD_TO_VFS_OP(VFS_UNMOUNT)] = VFS_OP_NULL,
                 [IPC_METHOD_TO_VFS_OP(VFS_DESTROY)] = VFS_OP_DEFINED,
@@ -106 +107 @@
                 callid = async_get_call(&call);
                 switch  (IPC_GET_METHOD(call)) {
+                case VFS_MOUNTED:
+                        tmpfs_mounted(callid, &call);
+                        break;
                 case VFS_MOUNT:
                         tmpfs_mount(callid, &call);

uspace/srv/fs/tmpfs/tmpfs.h

@@ -41 +41 @@
 #include <libadt/hash_table.h>
 
+#ifndef dprintf
 #define dprintf(...)    printf(__VA_ARGS__)
+#endif
 
 typedef struct tmpfs_dentry {
@@ -63 +65 @@
 extern libfs_ops_t tmpfs_libfs_ops;
 
+extern void tmpfs_mounted(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_mount(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_lookup(ipc_callid_t, ipc_call_t *);

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -394 +394 @@
 }
 
-void tmpfs_mount(ipc_callid_t rid, ipc_call_t *request)
-{
-        dev_handle_t mr_dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
-        fs_index_t mr_index = (fs_index_t) IPC_GET_ARG2(*request);
-        fs_handle_t mp_fs_handle = (fs_handle_t) IPC_GET_ARG3(*request);
-        dev_handle_t mp_dev_handle = (dev_handle_t) IPC_GET_ARG4(*request);
-        fs_index_t mp_index = (fs_index_t) IPC_GET_ARG5(*request);
-        
-        if ((mr_index == root->index) &&
-                (mp_fs_handle == tmpfs_reg.fs_handle) &&
-                (mp_index == mr_index)) {
-                
-                if (mr_dev_handle >= 0) {
-                        if (tmpfs_restore(mr_dev_handle))
-                                ipc_answer_0(rid, EOK);
-                        else
-                                ipc_answer_0(rid, ELIMIT);
-                } else
-                        ipc_answer_0(rid, EOK);
-        } else
-                ipc_answer_0(rid, ENOTSUP);
-}
-
-void tmpfs_lookup(ipc_callid_t rid, ipc_call_t *request)
-{
+void tmpfs_mounted(ipc_callid_t rid, ipc_call_t *request)
+{
+        dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+
         /* Initialize TMPFS. */
         if (!root && !tmpfs_init()) {
@@ -424 +403 @@
                 return;
         }
+
+        if (dev_handle >= 0) {
+                if (tmpfs_restore(dev_handle))
+                        ipc_answer_0(rid, EOK);
+                else
+                        ipc_answer_0(rid, ELIMIT);
+        } else {
+                        ipc_answer_0(rid, EOK);
+        }
+}
+
+void tmpfs_mount(ipc_callid_t rid, ipc_call_t *request)
+{
+        dev_handle_t mp_dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+        fs_index_t mp_index = (fs_index_t) IPC_GET_ARG2(*request);
+        fs_handle_t mr_fs_handle = (fs_handle_t) IPC_GET_ARG3(*request);
+        dev_handle_t mr_dev_handle = (dev_handle_t) IPC_GET_ARG4(*request);
+        
+        ipc_answer_0(rid, ENOTSUP);
+}
+
+void tmpfs_lookup(ipc_callid_t rid, ipc_call_t *request)
+{
         libfs_lookup(&tmpfs_libfs_ops, tmpfs_reg.fs_handle, rid, request);
 }