Changeset 89128f3 in mainline for uspace/srv/fs/mfs/mfs_inode.c


Ignore:
Timestamp:
2011-12-08T23:12:14Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9c986d3
Parents:
b25199bc (diff), c40f385 (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/fs/mfs/mfs_inode.c

    rb25199bc r89128f3  
    235235
    236236        r = block_get(&b, mnode->instance->service_id,
    237                       itable_off + inum / sbi->ino_per_block,
    238                       BLOCK_FLAGS_NONE);
     237            itable_off + inum / sbi->ino_per_block,
     238            BLOCK_FLAGS_NONE);
    239239
    240240        if (r != EOK)
    … …  
    278278
    279279        r = block_get(&b, mnode->instance->service_id,
    280                       itable_off + inum / sbi->ino_per_block,
    281                       BLOCK_FLAGS_NONE);
     280            itable_off + inum / sbi->ino_per_block,
     281            BLOCK_FLAGS_NONE);
    282282
    283283        if (r != EOK)
Note: See TracChangeset for help on using the changeset viewer.