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

Timestamp:

2008-10-27T16:53:38Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7a5cdded

Parents:

04619ba

Message:

Move libfs_blockread(), block_get() and block_put() to libblock.

File:

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

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -46 +46 @@
 #include <sys/types.h>
 #include <as.h>
-#include <libfs.h>
+#include <libblock.h>
 #include <ipc/services.h>
 #include <ipc/devmap.h>
@@ -71 +71 @@
                 uint32_t size;
                 
-                if (!libfs_blockread(phone, block, bufpos, buflen, pos, &entry,
+                if (!blockread(phone, block, bufpos, buflen, pos, &entry,
                     sizeof(entry), TMPFS_BLOCK_SIZE))
                         return false;
@@ -91 +91 @@
                         }
                         
-                        if (!libfs_blockread(phone, block, bufpos, buflen, pos,
-                            fname, entry.len, TMPFS_BLOCK_SIZE)) {
+                        if (!blockread(phone, block, bufpos, buflen, pos, fname,
+                            entry.len, TMPFS_BLOCK_SIZE)) {
                                 ops->destroy((void *) node);
                                 free(fname);
@@ -106 +106 @@
                         free(fname);
                         
-                        if (!libfs_blockread(phone, block, bufpos, buflen, pos,
-                            &size, sizeof(size), TMPFS_BLOCK_SIZE))
+                        if (!blockread(phone, block, bufpos, buflen, pos, &size,
+                            sizeof(size), TMPFS_BLOCK_SIZE))
                                 return false;
                         
@@ -117 +117 @@
                         
                         node->size = size;
-                        if (!libfs_blockread(phone, block, bufpos, buflen, pos,
+                        if (!blockread(phone, block, bufpos, buflen, pos,
                             node->data, size, TMPFS_BLOCK_SIZE))
                                 return false;
@@ -133 +133 @@
                         }
                         
-                        if (!libfs_blockread(phone, block, bufpos, buflen, pos,
-                            fname, entry.len, TMPFS_BLOCK_SIZE)) {
+                        if (!blockread(phone, block, bufpos, buflen, pos, fname,
+                            entry.len, TMPFS_BLOCK_SIZE)) {
                                 ops->destroy((void *) node);
                                 free(fname);
@@ -188 +188 @@
         
         char tag[6];
-        if (!libfs_blockread(phone, block, &bufpos, &buflen, &pos, tag, 5,
+        if (!blockread(phone, block, &bufpos, &buflen, &pos, tag, 5,
             TMPFS_BLOCK_SIZE))
                 goto error;