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

Timestamp:

2011-08-16T18:53:00Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

49160c4

Parents:

e0e922d (diff), 45058baa (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) (2 diffs)

uspace/srv/fs/tmpfs/tmpfs.h

@@ -61 +61 @@
         fs_node_t *bp;          /**< Back pointer to the FS node. */
         fs_index_t index;       /**< TMPFS node index. */
-        devmap_handle_t devmap_handle;/**< Device handle. */
+        service_id_t service_id;/**< Service ID of block device. */
         link_t nh_link;         /**< Nodes hash table link. */
         tmpfs_dentry_type_t type;
@@ -74 +74 @@
 
 extern bool tmpfs_init(void);
-extern bool tmpfs_restore(devmap_handle_t);
+extern bool tmpfs_restore(service_id_t);
 
 #endif