Changes in uspace/srv/fs/mfs/mfs_balloc.c [c2e50d7:7a46bfe] in mainline

File:

• uspace/srv/fs/mfs/mfs_balloc.c (modified) (12 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
@@ -122 +122 @@
         block_t *b;
 
+        assert(inst != NULL);
         sbi = inst->sbi;
+        assert(sbi != NULL);
 
         if (bid == BMAP_ZONE) {
@@ -129 +131 @@
                 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 +152 @@
                 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;
@@ -190 +192 @@
         int r, freebit;
 
+        assert(inst != NULL);
         sbi = inst->sbi;
+        assert(sbi != NULL);
 
         if (bid == BMAP_ZONE) {
@@ -198 +202 @@
                 limit = sbi->nzones - sbi->firstdatazone - 1;
         } else {
-                /* bid == BMAP_INODE */
+                /*bid == BMAP_INODE*/
                 search = &sbi->isearch;
                 start_block = 2;
@@ -212 +216 @@
         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)
@@ -220 +224 @@
 
                 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 +233 @@
                 }
 
-                /* 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 +250 @@
 
         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 +264 @@
 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 +272 @@
 
         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;
                 }