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

Timestamp:

2010-11-26T20:08:10Z (14 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_dump.c (modified) (4 diffs)

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -41 +41 @@
 #include <errno.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <sys/types.h>
 #include <as.h>
@@ -55 +55 @@
 
 static bool
-tmpfs_restore_recursion(dev_handle_t dev, off_t *bufpos, size_t *buflen,
-    off_t *pos, fs_node_t *pfn)
+tmpfs_restore_recursion(devmap_handle_t dev, size_t *bufpos, size_t *buflen,
+    aoff64_t *pos, fs_node_t *pfn)
 {
         struct rdentry entry;
@@ -161 +161 @@
 }
 
-bool tmpfs_restore(dev_handle_t dev)
+bool tmpfs_restore(devmap_handle_t dev)
 {
         libfs_ops_t *ops = &tmpfs_libfs_ops;
@@ -171 +171 @@
                 return false; 
         
-        off_t bufpos = 0;
+        size_t bufpos = 0;
         size_t buflen = 0;
-        off_t pos = 0;
+        aoff64_t pos = 0;
         
         char tag[6];