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

Timestamp:

2008-10-28T15:40:19Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

916bf1a

Parents:

5cf723b

Message:

Setup communication parameters with the block device in block_init(). The file
system now doesn't know anything about the communication with the block device.
Rename blockread() to block_read(). The boot block is now read only once. The file
system can get access it using the block_bb_get() function.

File:

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

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -39 +39 @@
 #include "tmpfs.h"
 #include "../../vfs/vfs.h"
-#include <ipc/ipc.h>
-#include <async.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -47 +45 @@
 #include <as.h>
 #include <libblock.h>
-#include <ipc/services.h>
-#include <ipc/devmap.h>
-#include <sys/mman.h>
 #include <byteorder.h>
 
@@ -60 +55 @@
 
 static bool
-tmpfs_restore_recursion(int phone, void *block, off_t *bufpos, size_t *buflen,
-    off_t *pos, tmpfs_dentry_t *parent)
+tmpfs_restore_recursion(int dev, off_t *bufpos, size_t *buflen, off_t *pos,
+    tmpfs_dentry_t *parent)
 {
         struct rdentry entry;
@@ -71 +66 @@
                 uint32_t size;
                 
-                if (!blockread(phone, block, bufpos, buflen, pos, &entry,
-                    sizeof(entry), TMPFS_BLOCK_SIZE))
+                if (!block_read(dev, bufpos, buflen, pos, &entry, sizeof(entry),
+                    TMPFS_BLOCK_SIZE))
                         return false;
                 
@@ -91 +86 @@
                         }
                         
-                        if (!blockread(phone, block, bufpos, buflen, pos, fname,
+                        if (!block_read(dev, bufpos, buflen, pos, fname,
                             entry.len, TMPFS_BLOCK_SIZE)) {
                                 ops->destroy((void *) node);
@@ -106 +101 @@
                         free(fname);
                         
-                        if (!blockread(phone, block, bufpos, buflen, pos, &size,
+                        if (!block_read(dev, bufpos, buflen, pos, &size,
                             sizeof(size), TMPFS_BLOCK_SIZE))
                                 return false;
@@ -117 +112 @@
                         
                         node->size = size;
-                        if (!blockread(phone, block, bufpos, buflen, pos,
-                            node->data, size, TMPFS_BLOCK_SIZE))
+                        if (!block_read(dev, bufpos, buflen, pos, node->data,
+                            size, TMPFS_BLOCK_SIZE))
                                 return false;
                         
@@ -133 +128 @@
                         }
                         
-                        if (!blockread(phone, block, bufpos, buflen, pos, fname,
-                            entry.len, TMPFS_BLOCK_SIZE)) {
+                        if (!block_read(dev, bufpos, buflen, pos,
+                            fname, entry.len, TMPFS_BLOCK_SIZE)) {
                                 ops->destroy((void *) node);
                                 free(fname);
@@ -148 +143 @@
                         free(fname);
                         
-                        if (!tmpfs_restore_recursion(phone, block, bufpos,
-                            buflen, pos, node))
+                        if (!tmpfs_restore_recursion(dev, bufpos, buflen, pos,
+                            node))
                                 return false;
                         
@@ -164 +159 @@
 {
         libfs_ops_t *ops = &tmpfs_libfs_ops;
+        int rc;
 
-        void *block = mmap(NULL, TMPFS_BLOCK_SIZE,
-            PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
-        
-        if (block == NULL)
-                return false;
-        
-        int phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
-            DEVMAP_CONNECT_TO_DEVICE, dev);
-
-        if (phone < 0) {
-                munmap(block, TMPFS_BLOCK_SIZE);
-                return false;
-        }
-        
-        if (ipc_share_out_start(phone, block, AS_AREA_READ | AS_AREA_WRITE) !=
-            EOK)
-                goto error;
+        rc = block_init(dev, TMPFS_BLOCK_SIZE, 0, 0);
+        if (rc != EOK)
+                return false; 
         
         off_t bufpos = 0;
@@ -188 +170 @@
         
         char tag[6];
-        if (!blockread(phone, block, &bufpos, &buflen, &pos, tag, 5,
+        if (!block_read(dev, &bufpos, &buflen, &pos, tag, 5,
             TMPFS_BLOCK_SIZE))
                 goto error;
@@ -196 +178 @@
                 goto error;
         
-        if (!tmpfs_restore_recursion(phone, block, &bufpos, &buflen, &pos,
+        if (!tmpfs_restore_recursion(dev, &bufpos, &buflen, &pos,
             ops->root_get(dev)))
                 goto error;
                 
-        ipc_hangup(phone);
-        munmap(block, TMPFS_BLOCK_SIZE);
+        block_fini(dev);
         return true;
         
 error:
-        ipc_hangup(phone);
-        munmap(block, TMPFS_BLOCK_SIZE);
+        block_fini(dev);
         return false;
 }