Changeset 6843a9c in mainline for uspace/srv/fs/mfs/mfs_balloc.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/srv/fs/mfs/mfs_balloc.c (modified) (2 diffs)

uspace/srv/fs/mfs/mfs_balloc.c

@@ -198 +198 @@
                 limit = sbi->nzones - sbi->firstdatazone - 1;
         } else {
-                /*bid == BMAP_INODE*/
+                /* bid == BMAP_INODE */
                 search = &sbi->isearch;
                 start_block = 2;
@@ -212 +212 @@
         for (i = *search / bits_per_block; i < nblocks; ++i) {
                 r = block_get(&b, inst->service_id, i + start_block,
-                              BLOCK_FLAGS_NONE);
+                    BLOCK_FLAGS_NONE);
 
                 if (r != EOK)