Changeset 70ac0af in mainline

Timestamp:

2011-07-06T19:26:06Z (14 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

Location:

uspace/srv/fs/minixfs

Files:

• mfs.h (modified) (1 diff)
• mfs_balloc.c (modified) (4 diffs)
• mfs_inode.c (modified) (2 diffs)
• mfs_ops.c (modified) (4 diffs)
• mfs_rw.c (modified) (4 diffs)

uspace/srv/fs/minixfs/mfs.h

@@ -221 +221 @@
 /*mfs_balloc.c*/
 extern int
-mfs_alloc_bit(struct mfs_instance *inst, uint32_t *idx, bmap_id_t bid);
-
-extern int
-mfs_free_bit(struct mfs_instance *inst, uint32_t idx, bmap_id_t bid);
+mfs_alloc_inode(struct mfs_instance *inst, uint32_t *inum);
+
+extern int
+mfs_free_inode(struct mfs_instance *inst, uint32_t inum);
+
+extern int
+mfs_alloc_zone(struct mfs_instance *inst, uint32_t *zone);
+
+extern int
+mfs_free_zone(struct mfs_instance *inst, uint32_t zone);
 
 #endif

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);

uspace/srv/fs/minixfs/mfs_inode.c

@@ -338 +338 @@
                         continue; /*Sparse block*/
 
-                r = mfs_free_bit(mnode->instance, old_zone, BMAP_ZONE);
+                r = mfs_free_zone(mnode->instance, old_zone);
                 on_error(r, goto exit_error);
         }
@@ -379 +379 @@
                 uint32_t dummy;
 
-                r = mfs_alloc_bit(mnode->instance, &new_zone, BMAP_ZONE);
+                r = mfs_alloc_zone(mnode->instance, &new_zone);
                 on_error(r, return r);
 

uspace/srv/fs/minixfs/mfs_ops.c

@@ -268 +268 @@
 
         /*Alloc a new inode*/
-        r = mfs_alloc_bit(inst, &inum, BMAP_INODE);
+        r = mfs_alloc_inode(inst, &inum);
         on_error(r, return r);
 
@@ -769 +769 @@
                 if (block == 0) {
                         /*Writing in a sparse block*/
-                        r = mfs_alloc_bit(mnode->instance, &block, BMAP_ZONE);
+                        r = mfs_alloc_zone(mnode->instance, &block);
                         on_error(r, goto out_err);
                         flags = BLOCK_FLAGS_NOREAD;
@@ -776 +776 @@
                 uint32_t dummy;
 
-                r = mfs_alloc_bit(mnode->instance, &block, BMAP_ZONE);
+                r = mfs_alloc_zone(mnode->instance, &block);
                 on_error(r, goto out_err);
 
@@ -849 +849 @@
         r = inode_shrink(mnode, mnode->ino_i->i_size);
         on_error(r, return r);
-        r = mfs_free_bit(mnode->instance, mnode->ino_i->index, BMAP_INODE);
+        r = mfs_free_inode(mnode->instance, mnode->ino_i->index);
         on_error(r, return r);
 

uspace/srv/fs/minixfs/mfs_rw.c

@@ -100 +100 @@
 
         if (old_zone > 0)
-                r = mfs_free_bit(mnode->instance, old_zone, BMAP_ZONE);
+                r = mfs_free_zone(mnode->instance, old_zone);
 
         return r;
@@ -256 +256 @@
                 /*free the single indirect zone*/
                 if (ino_i->i_izone[0]) {
-                        r = mfs_free_bit(inst, ino_i->i_izone[0], BMAP_ZONE);
+                        r = mfs_free_zone(inst, ino_i->i_izone[0]);
                         on_error(r, return r);
 
@@ -286 +286 @@
                         continue;
 
-                r = mfs_free_bit(inst, dbl_zone[i], BMAP_ZONE);
+                r = mfs_free_zone(inst, dbl_zone[i]);
                 on_error(r, return r);
         }
 
         if (fzone_to_free == 0) {
-                r = mfs_free_bit(inst, ino_i->i_izone[1], BMAP_ZONE);
+                r = mfs_free_zone(inst, ino_i->i_izone[1]);
                 ino_i->i_izone[1] = 0;
                 ino_i->dirty = true;
@@ -321 +321 @@
         int r;
 
-        r = mfs_alloc_bit(inst, zone, BMAP_ZONE);
+        r = mfs_alloc_zone(inst, zone);
         on_error(r, return r);