Changeset 40949d5 in mainline

Timestamp:

2011-05-02T18:55: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:

c2fcfc0

Parents:

fdc05ca

Message:

Fix bugs in bitmap code

File:

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

uspace/srv/fs/minixfs/mfs_balloc.c

@@ -128 +128 @@
                 on_error(r, goto out);
 
+                unsigned tmp = *search % bits_per_block;
+
                 freebit = find_free_bit_and_set(b->data, sbi->block_size,
-                                                sbi->native, *search);
+                                                sbi->native, tmp);
                 if (freebit == -1) {
                         /*No free bit in this block*/
@@ -138 +140 @@
                 /*Free bit found in this block, compute the real index*/
                 *idx = freebit + bits_per_block * i;
-                *idx += (bid == BMAP_INODE);
+                *idx += (bid == BMAP_INODE) ? 1 : 0;
                 mfsdebug("alloc index %d %d\n", (int) *idx, i);
                 if (*idx > limit) {
@@ -175 +177 @@
         const size_t chunk_bits = sizeof(bitchunk_t) * 8;
 
-        for (i = start_bit / sizeof(uint32_t);
-             i < bsize / sizeof(uint32_t); ++i) {
+        for (i = start_bit / chunk_bits;
+             i < bsize / sizeof(bitchunk_t); ++i) {
                 if (!(~b[i])) {
                         /*No free bit in this chunk*/