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

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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) (13 diffs)

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -55 +55 @@
 
 static bool
-tmpfs_restore_recursion(devmap_handle_t dev, size_t *bufpos, size_t *buflen,
+tmpfs_restore_recursion(service_id_t dsid, size_t *bufpos, size_t *buflen,
     aoff64_t *pos, fs_node_t *pfn)
 {
@@ -68 +68 @@
                 uint32_t size;
                 
-                if (block_seqread(dev, bufpos, buflen, pos, &entry,
+                if (block_seqread(dsid, bufpos, buflen, pos, &entry,
                     sizeof(entry)) != EOK)
                         return false;
@@ -82 +82 @@
                                 return false;
                         
-                        rc = ops->create(&fn, dev, L_FILE);
+                        rc = ops->create(&fn, dsid, L_FILE);
                         if (rc != EOK || fn == NULL) {
                                 free(fname);
@@ -88 +88 @@
                         }
                         
-                        if (block_seqread(dev, bufpos, buflen, pos, fname,
+                        if (block_seqread(dsid, bufpos, buflen, pos, fname,
                             entry.len) != EOK) {
                                 (void) ops->destroy(fn);
@@ -104 +104 @@
                         free(fname);
                         
-                        if (block_seqread(dev, bufpos, buflen, pos, &size,
+                        if (block_seqread(dsid, bufpos, buflen, pos, &size,
                             sizeof(size)) != EOK)
                                 return false;
@@ -116 +116 @@
                         
                         nodep->size = size;
-                        if (block_seqread(dev, bufpos, buflen, pos, nodep->data,
+                        if (block_seqread(dsid, bufpos, buflen, pos, nodep->data,
                             size) != EOK)
                                 return false;
@@ -126 +126 @@
                                 return false;
                         
-                        rc = ops->create(&fn, dev, L_DIRECTORY);
+                        rc = ops->create(&fn, dsid, L_DIRECTORY);
                         if (rc != EOK || fn == NULL) {
                                 free(fname);
@@ -132 +132 @@
                         }
                         
-                        if (block_seqread(dev, bufpos, buflen, pos, fname,
+                        if (block_seqread(dsid, bufpos, buflen, pos, fname,
                             entry.len) != EOK) {
                                 (void) ops->destroy(fn);
@@ -148 +148 @@
                         free(fname);
                         
-                        if (!tmpfs_restore_recursion(dev, bufpos, buflen, pos,
+                        if (!tmpfs_restore_recursion(dsid, bufpos, buflen, pos,
                             fn))
                                 return false;
@@ -161 +161 @@
 }
 
-bool tmpfs_restore(devmap_handle_t dev)
+bool tmpfs_restore(service_id_t dsid)
 {
         libfs_ops_t *ops = &tmpfs_libfs_ops;
@@ -167 +167 @@
         int rc;
 
-        rc = block_init(EXCHANGE_SERIALIZE, dev, TMPFS_COMM_SIZE);
+        rc = block_init(EXCHANGE_SERIALIZE, dsid, TMPFS_COMM_SIZE);
         if (rc != EOK)
                 return false; 
@@ -176 +176 @@
         
         char tag[6];
-        if (block_seqread(dev, &bufpos, &buflen, &pos, tag, 5) != EOK)
+        if (block_seqread(dsid, &bufpos, &buflen, &pos, tag, 5) != EOK)
                 goto error;
         
@@ -183 +183 @@
                 goto error;
         
-        rc = ops->root_get(&fn, dev);
+        rc = ops->root_get(&fn, dsid);
         if (rc != EOK)
                 goto error;
 
-        if (!tmpfs_restore_recursion(dev, &bufpos, &buflen, &pos, fn))
-                goto error;
-                
-        block_fini(dev);
+        if (!tmpfs_restore_recursion(dsid, &bufpos, &buflen, &pos, fn))
+                goto error;
+                
+        block_fini(dsid);
         return true;
         
 error:
-        block_fini(dev);
+        block_fini(dsid);
         return false;
 }