Changeset 8829e33 in mainline

Timestamp:

2011-04-05T17:07:31Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

af8ce880

Parents:

a791a96

Message:

Fixes to mfs_balloc.c :

• Remove magic numbers
• Fix incorrect index calculation in mfs_alloc_bit()

File:

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

uspace/srv/fs/minixfs/mfs_balloc.c

@@ -81 +81 @@
         bitchunk_t *ptr = b->data;
         bitchunk_t chunk;
-
-        chunk = conv32(sbi->native, ptr[idx / 32]);
-        chunk &= ~(1 << (idx % 32));
-        ptr[idx / 32] = conv32(sbi->native, chunk);
+        const size_t chunk_bits = sizeof(bitchunk_t) * 8;
+
+        chunk = conv32(sbi->native, ptr[idx / chunk_bits]);
+        chunk &= ~(1 << (idx % chunk_bits));
+        ptr[idx / chunk_bits] = conv32(sbi->native, chunk);
         b->dirty = true;
         r = EOK;
@@ -140 +141 @@
                 }
 
-                /*Free bit found, compute real index*/
-                *idx = (freebit + sbi->block_size * 8 * i);
+                /*Free bit found in this block, compute the real index*/
+                *idx = (freebit + bits_per_block * i);
                 if (*idx > limit) {
                         /*Index is beyond the limit, it is invalid*/
@@ -148 +149 @@
                 }
 
-                *search = i * bits_per_block + *idx;
+                *search = *idx;
                 b->dirty = true;
                 block_put(b);
@@ -177 +178 @@
         unsigned i, j;
         bitchunk_t chunk;
+        const size_t chunk_bits = sizeof(bitchunk_t) * 8;
 
         for (i = start_bit; i < bsize / sizeof(uint32_t); ++i) {
@@ -186 +188 @@
                 chunk = conv32(native, b[i]);
 
-                for (j = 0; j < 32; ++j) {
+                for (j = 0; j < chunk_bits; ++j) {
                         if (chunk & (1 << j)) {
-                                r = i * 32 + j;
+                                r = i * chunk_bits + j;
                                 chunk |= 1 << j;
                                 b[i] = conv32(native, chunk);