Changeset 5cef315 in mainline

Timestamp:

2018-10-01T23:41:49Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dbcaa2d

Parents:

3f7fe9e

Message:

This makes us pass e2fsck -f, not entirely sure why.

Location:

uspace/lib/ext4/src

Files:

• filesystem.c (modified) (1 diff)
• superblock.c (modified) (4 diffs)

uspace/lib/ext4/src/filesystem.c

@@ -703 +703 @@
                 /* One for block bitmap one for inode bitmap */
                 free_blocks = free_blocks - reserved - 2 - inode_table_blocks;
+                if (bg_index == 0)
+                        ++free_blocks; /* XXX Why? */
 
                 ext4_block_group_set_free_blocks_count(bg_ref->block_group,

uspace/lib/ext4/src/superblock.c

@@ -1248 +1248 @@
 uint32_t ext4_superblock_get_block_group_count(ext4_superblock_t *sb)
 {
-        uint64_t blocks_count = ext4_superblock_get_blocks_count(sb);
+        uint64_t blocks_count = ext4_superblock_get_blocks_count(sb) - 1;
         uint32_t blocks_per_group = ext4_superblock_get_blocks_per_group(sb);
 
@@ -1274 +1274 @@
             ext4_superblock_get_blocks_per_group(sb);
         uint64_t total_blocks =
-            ext4_superblock_get_blocks_count(sb);
+            ext4_superblock_get_blocks_count(sb) - 1;
 
         if (bgid < block_group_count - 1)
@@ -1533 +1533 @@
         ext4_superblock_set_magic(sb, EXT4_SUPERBLOCK_MAGIC);
         ext4_superblock_set_inodes_count(sb, inodes_count);
-        ext4_superblock_set_blocks_count(sb, blocks_count);
+        /* This seems to include the boot block, despite the ext2fs docs */
+        ext4_superblock_set_blocks_count(sb, fs_blocks);
         ext4_superblock_set_reserved_blocks_count(sb, res_blocks);
         ext4_superblock_set_free_blocks_count(sb, free_blocks);
@@ -1583 +1584 @@
         /* Compute free blocks */
         free_blocks = blocks_count;
+        ++free_blocks; // XXX Why?
         for (idx = 0; idx < ngroups; idx++) {
                 free_blocks -= ext4_superblock_get_group_backup_blocks(sb, idx);