Changeset 46c20c8 in mainline for uspace/srv/fs/tmpfs/tmpfs.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

File:

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

uspace/srv/fs/tmpfs/tmpfs.h

@@ -29 +29 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
 #ifndef TMPFS_TMPFS_H_
@@ -40 +40 @@
 #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 +62 @@
         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;
@@ -95 +91 @@
 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