Changeset 3c8b0a8 in mainline for uspace/lib/ext4/src/superblock.c

Timestamp:

2018-12-15T15:48:59Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

4bb4cf88

Parents:

b6d5e31 (diff), 6ea5e7a (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:

Maurizio Lombardi <m.lombardi85@…> (2018-12-15 15:48:59)

git-committer:

GitHub <noreply@…> (2018-12-15 15:48:59)

Message:

Merge pull request #143 from maurizio-lombardi/ext4_fixes_v2

Ext4 fixes

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