Changeset 8fb1bf82 in mainline for uspace/srv/fs/tmpfs/tmpfs_dump.c

Timestamp:

2010-11-25T13:42:50Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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_dump.c (modified) (2 diffs)

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -55 +55 @@
 
 static bool
-tmpfs_restore_recursion(dev_handle_t dev, size_t *bufpos, size_t *buflen,
+tmpfs_restore_recursion(devmap_handle_t dev, size_t *bufpos, size_t *buflen,
     aoff64_t *pos, fs_node_t *pfn)
 {
@@ -161 +161 @@
 }
 
-bool tmpfs_restore(dev_handle_t dev)
+bool tmpfs_restore(devmap_handle_t dev)
 {
         libfs_ops_t *ops = &tmpfs_libfs_ops;