Changeset 224174f in mainline for uspace/srv/fs/mfs/mfs_balloc.c

Timestamp:

2013-07-11T13:16:57Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

2b3e8840, b2c96093

Parents:

990ab7d (diff), 3a67d63 (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:

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

uspace/srv/fs/mfs/mfs_balloc.c

@@ -128 +128 @@
                 start_block = 2 + sbi->ibmap_blocks;
                 if (idx > sbi->nzones) {
-                        printf(NAME ": Error! Trying to free beyond the" \
+                        printf(NAME ": Error! Trying to free beyond the "
                             "bitmap max size\n");
                         return -1;
@@ -137 +137 @@
                 start_block = 2;
                 if (idx > sbi->ninodes) {
-                        printf(NAME ": Error! Trying to free beyond the" \
+                        printf(NAME ": Error! Trying to free beyond the "
                             "bitmap max size\n");
                         return -1;
@@ -202 +202 @@
                 start_block = 2;
                 nblocks = sbi->ibmap_blocks;
-                limit = sbi->ninodes;
+                limit = sbi->ninodes - 1;
         }
         bits_per_block = sbi->block_size * 8;