Changeset 8565a42 in mainline for uspace/lib/ext4/src/ialloc.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• uspace/lib/ext4/src/ialloc.c (modified) (17 diffs)

uspace/lib/ext4/src/ialloc.c

@@ -100 +100 @@
 {
         ext4_superblock_t *sb = fs->superblock;
-        
+
         /* Compute index of block group and load it */
         uint32_t block_group = ext4_ialloc_get_bgid_of_inode(sb, index);
-        
+
         ext4_block_group_ref_t *bg_ref;
         errno_t rc = ext4_filesystem_get_block_group_ref(fs, block_group, &bg_ref);
         if (rc != EOK)
                 return rc;
-        
+
         /* Load i-node bitmap */
         uint32_t bitmap_block_addr = ext4_block_group_get_inode_bitmap(
@@ -117 +117 @@
         if (rc != EOK)
                 return rc;
-        
+
         /* Free i-node in the bitmap */
         uint32_t index_in_group = ext4_ialloc_inode2index_in_group(sb, index);
         ext4_bitmap_free_bit(bitmap_block->data, index_in_group);
         bitmap_block->dirty = true;
-        
+
         /* Put back the block with bitmap */
         rc = block_put(bitmap_block);
@@ -130 +130 @@
                 return rc;
         }
-        
+
         /* If released i-node is a directory, decrement used directories count */
         if (is_dir) {
@@ -139 +139 @@
                     bg_used_dirs);
         }
-        
+
         /* Update block group free inodes count */
         uint32_t free_inodes = ext4_block_group_get_free_inodes_count(
@@ -146 +146 @@
         ext4_block_group_set_free_inodes_count(bg_ref->block_group, sb,
             free_inodes);
-        
+
         bg_ref->dirty = true;
-        
+
         /* Put back the modified block group */
         rc = ext4_filesystem_put_block_group_ref(bg_ref);
         if (rc != EOK)
                 return rc;
-        
+
         /* Update superblock free inodes count */
         uint32_t sb_free_inodes =
@@ -159 +159 @@
         sb_free_inodes++;
         ext4_superblock_set_free_inodes_count(sb, sb_free_inodes);
-        
+
         return EOK;
 }
@@ -178 +178 @@
 {
         ext4_superblock_t *sb = fs->superblock;
-        
+
         uint32_t bgid = 0;
         uint32_t bg_count = ext4_superblock_get_block_group_count(sb);
         uint32_t sb_free_inodes = ext4_superblock_get_free_inodes_count(sb);
         uint32_t avg_free_inodes = sb_free_inodes / bg_count;
-        
+
         /* Try to find free i-node in all block groups */
         while (bgid < bg_count) {
@@ -191 +191 @@
                 if (rc != EOK)
                         return rc;
-                
+
                 ext4_block_group_t *bg = bg_ref->block_group;
-                
+
                 /* Read necessary values for algorithm */
                 uint32_t free_blocks = ext4_block_group_get_free_blocks_count(bg, sb);
                 uint32_t free_inodes = ext4_block_group_get_free_inodes_count(bg, sb);
                 uint32_t used_dirs = ext4_block_group_get_used_dirs_count(bg, sb);
-                
+
                 /*
                  * Check if this block group is a good candidate
@@ -216 +216 @@
                         uint32_t bitmap_block_addr = ext4_block_group_get_inode_bitmap(
                             bg_ref->block_group, sb);
-                        
+
                         block_t *bitmap_block;
                         rc = block_get(&bitmap_block, fs->device, bitmap_block_addr,
@@ -224 +224 @@
                                 return rc;
                         }
-                        
+
                         /* Try to allocate i-node in the bitmap */
                         uint32_t inodes_in_group = ext4_superblock_get_inodes_in_group(sb, bgid);
@@ -230 +230 @@
                         rc = ext4_bitmap_find_free_bit_and_set(bitmap_block->data,
                             0, &index_in_group, inodes_in_group);
-                        
+
                         /* Block group has not any free i-node */
                         if (rc == ENOSPC) {
@@ -246 +246 @@
                                 continue;
                         }
-                        
+
                         /* Free i-node found, save the bitmap */
                         bitmap_block->dirty = true;
-                        
+
                         rc = block_put(bitmap_block);
                         if (rc != EOK) {
@@ -255 +255 @@
                                 return rc;
                         }
-                        
+
                         /* Modify filesystem counters */
                         free_inodes--;
                         ext4_block_group_set_free_inodes_count(bg, sb, free_inodes);
-                        
+
                         /* Increment used directories counter */
                         if (is_dir) {
@@ -265 +265 @@
                                 ext4_block_group_set_used_dirs_count(bg, sb, used_dirs);
                         }
-                        
+
                         /* Decrease unused inodes count */
                         if (ext4_block_group_has_flag(bg,
@@ -271 +271 @@
                                 uint32_t unused =
                                     ext4_block_group_get_itable_unused(bg, sb);
-                                
+
                                 uint32_t inodes_in_group =
                                     ext4_superblock_get_inodes_in_group(sb, bgid);
-                                
+
                                 uint32_t free = inodes_in_group - unused;
-                                
+
                                 if (index_in_group >= free) {
                                         unused = inodes_in_group - (index_in_group + 1);
@@ -282 +282 @@
                                 }
                         }
-                        
+
                         /* Save modified block group */
                         bg_ref->dirty = true;
-                        
+
                         rc = ext4_filesystem_put_block_group_ref(bg_ref);
                         if (rc != EOK)
                                 return rc;
-                        
+
                         /* Update superblock */
                         sb_free_inodes--;
                         ext4_superblock_set_free_inodes_count(sb, sb_free_inodes);
-                        
+
                         /* Compute the absolute i-nodex number */
                         *index = ext4_ialloc_index_in_group2inode(sb, index_in_group, bgid);
-                        
+
                         return EOK;
                 }
-                
+
                 /* Block group not modified, put it and jump to the next block group */
                 rc = ext4_filesystem_put_block_group_ref(bg_ref);
@@ -307 +307 @@
                 ++bgid;
         }
-        
+
         return ENOSPC;
 }