Changeset a900fb1 in mainline

Timestamp:

2011-04-17T18:37:36Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

9e2d6dc

Parents:

6fcc03a

Message:

Fix some bugs in mfs_alloc_bit() function

File:

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

uspace/srv/fs/minixfs/mfs_balloc.c

@@ -142 +142 @@
 
                 /*Free bit found in this block, compute the real index*/
-                *idx = (freebit + bits_per_block * i);
+                *idx = freebit + bits_per_block * i;
+                *idx += (bid == BMAP_INODE);
+                mfsdebug("alloc index %d %d\n", (int) *idx, i);
                 if (*idx > limit) {
                         /*Index is beyond the limit, it is invalid*/
@@ -180 +182 @@
         const size_t chunk_bits = sizeof(bitchunk_t) * 8;
 
-        for (i = start_bit; i < bsize / sizeof(uint32_t); ++i) {
+        for (i = start_bit / sizeof(uint32_t);
+                                i < bsize / sizeof(uint32_t); ++i) {
                 if (!(~b[i])) {
                         /*No free bit in this chunk*/
@@ -189 +192 @@
 
                 for (j = 0; j < chunk_bits; ++j) {
-                        if (chunk & (1 << j)) {
+                        if (!(chunk & (1 << j))) {
+                                mfsdebug("i = %d j = %d\n", i, j);
                                 r = i * chunk_bits + j;
                                 chunk |= 1 << j;