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


Ignore:
Timestamp:
2011-09-06T23:34:35Z (13 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:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/srv/fs/mfs/mfs_balloc.c

    r7e9fce6 r038b289  
    5656{
    5757        int r = mfs_alloc_bit(inst, inum, BMAP_INODE);
    58 
    59         *inum += 1;
    6058        return r;
    6159}
     
    7169mfs_free_inode(struct mfs_instance *inst, uint32_t inum)
    7270{
    73         return mfs_free_bit(inst, inum - 1, BMAP_INODE);
     71        return mfs_free_bit(inst, inum, BMAP_INODE);
    7472}
    7573
     
    202200                start_block = 2 + sbi->ibmap_blocks;
    203201                nblocks = sbi->zbmap_blocks;
    204                 limit = sbi->nzones;
     202                limit = sbi->nzones - sbi->firstdatazone - 1;
    205203        } else {
    206204                /*bid == BMAP_INODE*/
Note: See TracChangeset for help on using the changeset viewer.