Changes in uspace/lib/ext4/src/superblock.c [6ea5e7a:6ba36a0] in mainline

File:

• uspace/lib/ext4/src/superblock.c (modified) (9 diffs)

uspace/lib/ext4/src/superblock.c

@@ -1315 +1315 @@
             ext4_superblock_get_blocks_per_group(sb);
         uint64_t total_blocks =
-            ext4_superblock_get_blocks_count(sb);
-        uint32_t first_block =
-            ext4_superblock_get_first_data_block(sb);
+            ext4_superblock_get_blocks_count(sb) - 1;
 
         if (bgid < block_group_count - 1)
                 return blocks_per_group;
         else
-                return (total_blocks - ((block_group_count - 1) * blocks_per_group)) - first_block;
+                return (total_blocks - ((block_group_count - 1) * blocks_per_group));
 }
 
@@ -1394 +1392 @@
 {
         sb->reserved_gdt_blocks = host2uint32_t_le(n);
-}
-
-/** Get the size of the flex groups
- *
- * @param sb    Pointer to the superblock
- *
- * @return      Size of the flex groups
- */
-uint32_t ext4_superblock_get_flex_group_size(ext4_superblock_t *sb)
-{
-        return 2 << sb->log_groups_per_flex;
 }
 
@@ -1478 +1465 @@
                  */
 
+                if (idx == 0 && block_size == 1024) {
+                        /*
+                         * Special case for first group were the boot block
+                         * resides
+                         */
+                        r++;
+                }
+
                 /* This accounts for the superblock */
                 r++;
@@ -1510 +1505 @@
         uuid_t uuid;
         uint32_t cur_ts;
-        uint64_t first_block = 0;
+        uint64_t first_block;
         uint64_t fs_blocks;
         uint32_t blocks_count;
@@ -1523 +1518 @@
         uint32_t idx;
         size_t fs_bsize;
-        size_t fs_bsize_log;
         errno_t rc;
         struct timespec ts;
@@ -1539 +1533 @@
         cur_ts = ts.tv_sec;
 
-        fs_bsize = cfg->bsize;
-        switch (fs_bsize) {
-        case 1024:
-                first_block = 1;
-                fs_bsize_log = 0;
-                blocks_group = 8192;
-                break;
-        case 2048:
-                fs_bsize_log = 1;
-                blocks_group = 8192 * 2;
-                break;
-        case 4096:
-                fs_bsize_log = 2;
-                blocks_group = 8192 * 4;
-                break;
-        default:
-                return ENOTSUP;
-        }
+        fs_bsize = 1024;
+        first_block = 1; /* 1 for 1k block size, 0 otherwise */
 
         if (fs_bsize % dev_bsize == 0) {
@@ -1565 +1543 @@
                 fs_blocks = dev_bcnt * (dev_bsize / fs_bsize);
         }
+
+        /* FS blocks per group */
+        blocks_group = 8 * fs_bsize;
 
         /* Inodes per group */
@@ -1600 +1581 @@
         ext4_superblock_set_free_inodes_count(sb, inodes_count);
         ext4_superblock_set_first_data_block(sb, first_block);
-        ext4_superblock_set_log_block_size(sb, fs_bsize_log);
+        /* Block size will be 1024 bytes */
+        ext4_superblock_set_log_block_size(sb, 0);
         /* Fragment size should be equal to block size */
-        ext4_superblock_set_log_frag_size(sb, fs_bsize_log);
+        ext4_superblock_set_log_frag_size(sb, 0);
         ext4_superblock_set_blocks_per_group(sb, blocks_group);
         /* Should be the same as blocks per group. */
@@ -1652 +1634 @@
         /* 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);