Changeset 038b289 in mainline for uspace/srv/fs/mfs/mfs_balloc.c

Timestamp:

2011-09-06T23:34:35Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

888207c9, c05642d, c0e53ff

Parents:

7e9fce6 (diff), fb7e5a9a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge MFS improvements from lp:mfs.

File:

• uspace/srv/fs/mfs/mfs_balloc.c (moved) (moved from uspace/srv/fs/minixfs/mfs_balloc.c ) (3 diffs)

uspace/srv/fs/mfs/mfs_balloc.c

@@ -56 +56 @@
 {
         int r = mfs_alloc_bit(inst, inum, BMAP_INODE);
-
-        *inum += 1;
         return r;
 }
@@ -71 +69 @@
 mfs_free_inode(struct mfs_instance *inst, uint32_t inum)
 {
-        return mfs_free_bit(inst, inum - 1, BMAP_INODE);
+        return mfs_free_bit(inst, inum, BMAP_INODE);
 }
 
@@ -202 +200 @@
                 start_block = 2 + sbi->ibmap_blocks;
                 nblocks = sbi->zbmap_blocks;
-                limit = sbi->nzones;
+                limit = sbi->nzones - sbi->firstdatazone - 1;
         } else {
                 /*bid == BMAP_INODE*/