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

Timestamp:

2009-09-21T11:53:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4098e38

Parents:

2f636b6 (diff), c1618ed (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) (8 diffs)

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -47 +47 @@
 #include <byteorder.h>
 
-#define TMPFS_BLOCK_SIZE        1024
+#define TMPFS_COMM_SIZE         1024
 
 struct rdentry {
@@ -69 +69 @@
                 
                 if (block_seqread(dev, bufpos, buflen, pos, &entry,
-                    sizeof(entry), TMPFS_BLOCK_SIZE) != EOK)
+                    sizeof(entry)) != EOK)
                         return false;
                 
@@ -89 +89 @@
                         
                         if (block_seqread(dev, bufpos, buflen, pos, fname,
-                            entry.len, TMPFS_BLOCK_SIZE) != EOK) {
+                            entry.len) != EOK) {
                                 ops->destroy(fn);
                                 free(fname);
@@ -105 +105 @@
                         
                         if (block_seqread(dev, bufpos, buflen, pos, &size,
-                            sizeof(size), TMPFS_BLOCK_SIZE) != EOK)
+                            sizeof(size)) != EOK)
                                 return false;
                         
@@ -117 +117 @@
                         nodep->size = size;
                         if (block_seqread(dev, bufpos, buflen, pos, nodep->data,
-                            size, TMPFS_BLOCK_SIZE) != EOK)
+                            size) != EOK)
                                 return false;
                         
@@ -133 +133 @@
                         
                         if (block_seqread(dev, bufpos, buflen, pos, fname,
-                            entry.len, TMPFS_BLOCK_SIZE) != EOK) {
+                            entry.len) != EOK) {
                                 ops->destroy(fn);
                                 free(fname);
@@ -166 +166 @@
         int rc;
 
-        rc = block_init(dev, TMPFS_BLOCK_SIZE);
+        rc = block_init(dev, TMPFS_COMM_SIZE);
         if (rc != EOK)
                 return false; 
@@ -175 +175 @@
         
         char tag[6];
-        if (block_seqread(dev, &bufpos, &buflen, &pos, tag, 5,
-            TMPFS_BLOCK_SIZE) != EOK)
+        if (block_seqread(dev, &bufpos, &buflen, &pos, tag, 5) != EOK)
                 goto error;