Changeset 5e718d9 in mainline for uspace/srv/fs/tmpfs/tmpfs_dump.c

Timestamp:

2012-08-21T10:04:16Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

67edca6

Parents:

0da6c04 (diff), 6a97f2e (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 with upstream (lp:~wtachi/helenos/bithenge)

File:

• uspace/srv/fs/tmpfs/tmpfs_dump.c (modified) (7 diffs)

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -44 +44 @@
 #include <sys/types.h>
 #include <as.h>
-#include <libblock.h>
+#include <block.h>
 #include <byteorder.h>
 
 #define TMPFS_COMM_SIZE         1024
+
+static uint8_t tmpfs_buf[TMPFS_COMM_SIZE];
 
 struct rdentry {
@@ -68 +70 @@
                 uint32_t size;
                 
-                if (block_seqread(dsid, bufpos, buflen, pos, &entry,
+                if (block_seqread(dsid, tmpfs_buf, bufpos, buflen, pos, &entry,
                     sizeof(entry)) != EOK)
                         return false;
@@ -88 +90 @@
                         }
                         
-                        if (block_seqread(dsid, bufpos, buflen, pos, fname,
+                        if (block_seqread(dsid, tmpfs_buf, bufpos, buflen, pos, fname,
                             entry.len) != EOK) {
                                 (void) ops->destroy(fn);
@@ -104 +106 @@
                         free(fname);
                         
-                        if (block_seqread(dsid, bufpos, buflen, pos, &size,
+                        if (block_seqread(dsid, tmpfs_buf, bufpos, buflen, pos, &size,
                             sizeof(size)) != EOK)
                                 return false;
@@ -116 +118 @@
                         
                         nodep->size = size;
-                        if (block_seqread(dsid, bufpos, buflen, pos, nodep->data,
+                        if (block_seqread(dsid, tmpfs_buf, bufpos, buflen, pos, nodep->data,
                             size) != EOK)
                                 return false;
@@ -132 +134 @@
                         }
                         
-                        if (block_seqread(dsid, bufpos, buflen, pos, fname,
+                        if (block_seqread(dsid, tmpfs_buf, bufpos, buflen, pos, fname,
                             entry.len) != EOK) {
                                 (void) ops->destroy(fn);
@@ -176 +178 @@
         
         char tag[6];
-        if (block_seqread(dsid, &bufpos, &buflen, &pos, tag, 5) != EOK)
+        if (block_seqread(dsid, tmpfs_buf, &bufpos, &buflen, &pos, tag, 5) != EOK)
                 goto error;