Changeset efdfebc in mainline for uspace/lib/block/block.h

Timestamp:

2012-11-06T21:03:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/lib/block/block.h (moved) (moved from uspace/lib/block/libblock.h ) (2 diffs)

uspace/lib/block/block.h

@@ -84 +84 @@
         link_t free_link;
         /** Link for placing the block into the block hash table. */ 
-        link_t hash_link;
+        ht_link_t hash_link;
         /** Buffer with the block data. */
         void *data;
@@ -122 +122 @@
 extern int block_put(block_t *);
 
-extern int block_seqread(service_id_t, size_t *, size_t *, aoff64_t *, void *,
-    size_t);
+extern int block_seqread(service_id_t, void *, size_t *, size_t *, aoff64_t *,
+    void *, size_t);
 
 extern int block_get_bsize(service_id_t, size_t *);