Changeset 04803bf in mainline for uspace/srv/fs/tmpfs/tmpfs.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• uspace/srv/fs/tmpfs/tmpfs.h (modified) (5 diffs)

uspace/srv/fs/tmpfs/tmpfs.h

@@ -29 +29 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
 #ifndef TMPFS_TMPFS_H_
 #define TMPFS_TMPFS_H_
 
-#include <ipc/ipc.h>
 #include <libfs.h>
 #include <atomic.h>
@@ -40 +39 @@
 #include <bool.h>
 #include <adt/hash_table.h>
-
-#ifndef dprintf
-#define dprintf(...)    printf(__VA_ARGS__)
-#endif
 
 #define TMPFS_NODE(node)        ((node) ? (tmpfs_node_t *)(node)->data : NULL)
@@ -66 +61 @@
         fs_node_t *bp;          /**< Back pointer to the FS node. */
         fs_index_t index;       /**< TMPFS node index. */
-        dev_handle_t dev_handle;/**< Device handle. */
+        devmap_handle_t devmap_handle;/**< Device handle. */
         link_t nh_link;         /**< Nodes hash table link. */
         tmpfs_dentry_type_t type;
@@ -83 +78 @@
 extern void tmpfs_mounted(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_mount(ipc_callid_t, ipc_call_t *);
+extern void tmpfs_unmounted(ipc_callid_t, ipc_call_t *);
+extern void tmpfs_unmount(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_lookup(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_read(ipc_callid_t, ipc_call_t *);
@@ -93 +90 @@
 extern void tmpfs_sync(ipc_callid_t, ipc_call_t *);
 
-extern bool tmpfs_restore(dev_handle_t);
+extern bool tmpfs_restore(devmap_handle_t);
 
 #endif