Changeset 25696fea in mainline for uspace/srv/fs/mfs/mfs_balloc.c

Timestamp:

2011-10-15T20:05:00Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (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 with mainline

File:

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

uspace/srv/fs/mfs/mfs_balloc.c

@@ -36 +36 @@
 static int
 find_free_bit_and_set(bitchunk_t *b, const int bsize,
-                      const bool native, unsigned start_bit);
+    const bool native, unsigned start_bit);
 
 static int
@@ -129 +129 @@
                 if (idx > sbi->nzones) {
                         printf(NAME ": Error! Trying to free beyond the" \
-                               "bitmap max size\n");
+                            "bitmap max size\n");
                         return -1;
                 }
         } else {
-                /*bid == BMAP_INODE*/
+                /* bid == BMAP_INODE */
                 search = &sbi->isearch;
                 start_block = 2;
                 if (idx > sbi->ninodes) {
                         printf(NAME ": Error! Trying to free beyond the" \
-                               "bitmap max size\n");
+                            "bitmap max size\n");
                         return -1;
                 }
         }
 
-        /*Compute the bitmap block*/
+        /* Compute the bitmap block */
         uint32_t block = idx / (sbi->block_size * 8) + start_block;
 
@@ -150 +150 @@
                 goto out_err;
 
-        /*Compute the bit index in the block*/
+        /* Compute the bit index in the block */
         idx %= (sbi->block_size * 8);
         bitchunk_t *ptr = b->data;
@@ -220 +220 @@
 
                 freebit = find_free_bit_and_set(b->data, sbi->block_size,
-                                                sbi->native, tmp);
+                    sbi->native, tmp);
                 if (freebit == -1) {
-                        /*No free bit in this block*/
+                        /* No free bit in this block */
                         r = block_put(b);
                         if (r != EOK)
@@ -229 +229 @@
                 }
 
-                /*Free bit found in this block, compute the real index*/
+                /* Free bit found in this block, compute the real index */
                 *idx = freebit + bits_per_block * i;
                 if (*idx > limit) {
-                        /*Index is beyond the limit, it is invalid*/
+                        /* Index is beyond the limit, it is invalid */
                         r = block_put(b);
                         if (r != EOK)
@@ -246 +246 @@
 
         if (*search > 0) {
-                /*Repeat the search from the first bitmap block*/
+                /* Repeat the search from the first bitmap block */
                 *search = 0;
                 goto retry;
         }
 
-        /*Free bit not found, return error*/
+        /* Free bit not found, return error */
         return ENOSPC;
 
@@ -260 +260 @@
 static int
 find_free_bit_and_set(bitchunk_t *b, const int bsize,
-                      const bool native, unsigned start_bit)
+    const bool native, unsigned start_bit)
 {
         int r = -1;
@@ -268 +268 @@
 
         for (i = start_bit / chunk_bits;
-             i < bsize / sizeof(bitchunk_t); ++i) {
+            i < bsize / sizeof(bitchunk_t); ++i) {
+
                 if (!(~b[i])) {
-                        /*No free bit in this chunk*/
+                        /* No free bit in this chunk */
                         continue;
                 }