Changeset 1787e527 in mainline for uspace/lib/libblock/libblock.h

Timestamp:

2009-11-16T21:22:54Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

• uspace/lib/libblock/libblock.h (modified) (3 diffs)

uspace/lib/libblock/libblock.h

@@ -60 +60 @@
 #define BLOCK_FLAGS_NOREAD      1
 
-typedef unsigned bn_t;  /**< Block number type. */
+typedef uint64_t bn_t;  /**< Block number type. */
 
 typedef struct block {
@@ -69 +69 @@
         /** If true, the block needs to be written back to the block device. */
         bool dirty;
+        /** If true, the blcok does not contain valid data. */
+        bool toxic;
         /** Readers / Writer lock protecting the contents of the block. */
         fibril_rwlock_t contents_lock;
@@ -96 +98 @@
 extern void block_fini(dev_handle_t);
 
-extern int block_bb_read(dev_handle_t, off_t, size_t);
+extern int block_bb_read(dev_handle_t, bn_t);
 extern void *block_bb_get(dev_handle_t);
 
 extern int block_cache_init(dev_handle_t, size_t, unsigned, enum cache_mode);
 
-extern block_t *block_get(dev_handle_t, bn_t, int);
-extern void block_put(block_t *);
+extern int block_get(block_t **, dev_handle_t, bn_t, int);
+extern int block_put(block_t *);
 
 extern int block_seqread(dev_handle_t, off_t *, size_t *, off_t *, void *,
-    size_t, size_t);
+    size_t);
+
+extern int block_get_bsize(dev_handle_t, size_t *);
+extern int block_read_direct(dev_handle_t, bn_t, size_t, void *);
+extern int block_write_direct(dev_handle_t, bn_t, size_t, const void *);
 
 #endif