Changeset b5e68c8 in mainline for uspace/srv/fs/tmpfs/tmpfs.h

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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) (3 diffs)

uspace/srv/fs/tmpfs/tmpfs.h

@@ -34 +34 @@
 #define TMPFS_TMPFS_H_
 
-#include <ipc/ipc.h>
 #include <libfs.h>
 #include <atomic.h>
@@ -62 +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;
@@ -91 +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