Changeset 70ac0af in mainline for uspace/srv/fs/minixfs/mfs_balloc.c

Timestamp:

2011-07-06T19:26:06Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

e80c2ff

Parents:

efa5fa1

Message:

add wrapper functions to mfs_alloc_bit and mfs_free_bit to improve the code readability

File:

• uspace/srv/fs/minixfs/mfs_balloc.c (modified) (4 diffs)

uspace/srv/fs/minixfs/mfs_balloc.c

@@ -39 +39 @@
                       const bool native, unsigned start_bit);
 
-int
+static int
+mfs_free_bit(struct mfs_instance *inst, uint32_t idx, bmap_id_t bid);
+
+static int
+mfs_alloc_bit(struct mfs_instance *inst, uint32_t *idx, bmap_id_t bid);
+
+
+int
+mfs_alloc_inode(struct mfs_instance *inst, uint32_t *inum)
+{
+        return mfs_alloc_bit(inst, inum, BMAP_INODE);
+}
+
+int
+mfs_free_inode(struct mfs_instance *inst, uint32_t inum)
+{
+        return mfs_free_bit(inst, inum, BMAP_INODE);
+}
+
+int
+mfs_alloc_zone(struct mfs_instance *inst, uint32_t *zone)
+{
+        int r = mfs_alloc_bit(inst, zone, BMAP_ZONE);
+
+        *zone += inst->sbi->firstdatazone;
+        return r;
+}
+
+int
+mfs_free_zone(struct mfs_instance *inst, uint32_t zone)
+{
+        zone -= inst->sbi->firstdatazone;
+
+        return mfs_free_bit(inst, zone, BMAP_ZONE);
+}
+
+static int
 mfs_free_bit(struct mfs_instance *inst, uint32_t idx, bmap_id_t bid)
 {
@@ -52 +88 @@
 
         if (bid == BMAP_ZONE) {
-                idx -= sbi->firstdatazone;
                 start_block = 2 + sbi->ibmap_blocks;
                 if (idx > sbi->nzones) {
@@ -92 +127 @@
 }
 
-int
+static int
 mfs_alloc_bit(struct mfs_instance *inst, uint32_t *idx, bmap_id_t bid)
 {
@@ -152 +187 @@
 
                 *search = *idx;
-
-                if (bid == BMAP_ZONE)
-                        *idx += sbi->firstdatazone;
-
                 b->dirty = true;
                 r = block_put(b);