Changeset a6ba0c9 in mainline

Timestamp:

2010-11-27T17:46:58Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d70d80ed

Parents:

f092718

Message:

Rename boff to (p)ba.

Location:

uspace/lib/block

Files:

• libblock.c (modified) (10 diffs)
• libblock.h (modified) (1 diff)

uspace/lib/block/libblock.c

@@ -261 +261 @@
 {
         block_t *b = hash_table_get_instance(item, block_t, hash_link);
-        return b->boff == *key;
+        return b->lba == *key;
 }
 
@@ -339 +339 @@
                 }
 
-                unsigned long key = b->boff;
+                unsigned long key = b->lba;
                 hash_table_remove(&cache->block_hash, &key, 1);
                 
@@ -380 +380 @@
  *                              block pointer on success.
  * @param devmap_handle         Device handle of the block device.
- * @param boff                  Block offset.
+ * @param ba                    Block address (logical).
  * @param flags                 If BLOCK_FLAGS_NOREAD is specified, block_get()
  *                              will not read the contents of the block from the
@@ -387 +387 @@
  * @return                      EOK on success or a negative error code.
  */
-int block_get(block_t **block, devmap_handle_t devmap_handle, aoff64_t boff, int flags)
+int block_get(block_t **block, devmap_handle_t devmap_handle, aoff64_t ba, int flags)
 {
         devcon_t *devcon;
@@ -393 +393 @@
         block_t *b;
         link_t *l;
-        unsigned long key = boff;
+        unsigned long key = ba;
         int rc;
         
@@ -501 +501 @@
                          */
                         list_remove(&b->free_link);
-                        temp_key = b->boff;
+                        temp_key = b->lba;
                         hash_table_remove(&cache->block_hash, &temp_key, 1);
                 }
@@ -508 +508 @@
                 b->devmap_handle = devmap_handle;
                 b->size = cache->lblock_size;
-                b->boff = boff;
-                b->pba = ba_ltop(devcon, b->boff);
+                b->lba = ba;
+                b->pba = ba_ltop(devcon, b->lba);
                 hash_table_insert(&cache->block_hash, &key, &b->hash_link);
 
@@ -621 +621 @@
                          * Take the block out of the cache and free it.
                          */
-                        unsigned long key = block->boff;
+                        unsigned long key = block->lba;
                         hash_table_remove(&cache->block_hash, &key, 1);
                         free(block);
@@ -719 +719 @@
  *
  * @param devmap_handle Device handle of the block device.
- * @param ba            Address of first block.
+ * @param ba            Address of first block (physical).
  * @param cnt           Number of blocks.
  * @param src           Buffer for storing the data.
@@ -747 +747 @@
  *
  * @param devmap_handle Device handle of the block device.
- * @param ba            Address of first block.
+ * @param ba            Address of first block (physical).
  * @param cnt           Number of blocks.
  * @param src           The data to be written.

uspace/lib/block/libblock.h

@@ -74 +74 @@
         devmap_handle_t devmap_handle;
         /** Logical block address */
-        aoff64_t boff;
+        aoff64_t lba;
         /** Physical block address */
         aoff64_t pba;