Changeset 6dd7f65 in mainline

Timestamp:

2015-04-15T20:14:27Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

447201e

Parents:

749fe15b

Message:

libext4: add missing parts that will be needed to support flexible block groups

• Add function to read the superblock's fields "backup_bgs" (SUPER_SPARSE2).
• Add function to get the number of reserved GDT blocks.
• Drop the "s_" prefix from some superblock's fields.

Location:

uspace/lib/ext4

Files:

• libext4_superblock.c (modified) (1 diff)
• libext4_superblock.h (modified) (1 diff)
• libext4_types.h (modified) (3 diffs)

uspace/lib/ext4/libext4_superblock.c

@@ -1298 +1298 @@
 }
 
+/** Get the backup groups used with SPARSE_SUPER2
+ *
+ * @param sb    Pointer to the superblock
+ * @param g1    Output pointer to the first backup group
+ * @param g2    Output pointer to the second backup group
+ */
+void ext4_superblock_get_backup_groups_sparse2(ext4_superblock_t *sb,
+    uint32_t *g1, uint32_t *g2)
+{
+        *g1 = uint32_t_le2host(sb->backup_bgs[0]);
+        *g2 = uint32_t_le2host(sb->backup_bgs[1]);
+}
+
+/** Set the backup groups (SPARSE SUPER2)
+ *
+ * @param sb    Pointer to the superblock
+ * @param g1    Index of the first group
+ * @param g2    Index of the second group
+ */
+void ext4_superblock_set_backup_groups_sparse2(ext4_superblock_t *sb,
+    uint32_t g1, uint32_t g2)
+{
+        sb->backup_bgs[0] = host2uint32_t_le(g1);
+        sb->backup_bgs[1] = host2uint32_t_le(g2);
+}
+
+/** Get the number of blocks (per group) reserved to GDT expansion
+ *
+ * @param sb    Pointer to the superblock
+ *
+ * @return      Number of blocks
+ */
+uint32_t ext4_superblock_get_reserved_gdt_blocks(ext4_superblock_t *sb)
+{
+        return uint32_t_le2host(sb->reserved_gdt_blocks);
+}
+
+/** Set the number of blocks (per group) reserved to GDT expansion
+ *
+ * @param sb    Pointer to the superblock
+ * @param n     Number of reserved blocks
+ */
+void ext4_superblock_set_reserved_gdt_blocks(ext4_superblock_t *sb,
+    uint32_t n)
+{
+        sb->reserved_gdt_blocks = host2uint32_t_le(n);
+}
+
 /**
  * @}

uspace/lib/ext4/libext4_superblock.h

@@ -135 +135 @@
 extern void ext4_superblock_set_flags(ext4_superblock_t *, uint32_t);
 
+extern void ext4_superblock_get_backup_groups_sparse2(ext4_superblock_t *sb,
+    uint32_t *g1, uint32_t *g2);
+extern void ext4_superblock_set_backup_groups_sparse2(ext4_superblock_t *sb,
+    uint32_t g1, uint32_t g2);
+
+extern uint32_t ext4_superblock_get_reserved_gdt_blocks(ext4_superblock_t *sb);
+extern void ext4_superblock_set_reserved_gdt_blocks(ext4_superblock_t *sb,
+    uint32_t n);
+
 /* More complex superblock functions */
 extern bool ext4_superblock_has_flag(ext4_superblock_t *, uint32_t);

uspace/lib/ext4/libext4_types.h

@@ -83 +83 @@
          * happen if the EXT4_FEATURE_COMPAT_DIR_PREALLOC flag is on.
          */
-        uint8_t s_prealloc_blocks;       /* Number of blocks to try to preallocate */
-        uint8_t s_prealloc_dir_blocks;   /* Number to preallocate for dirs */
-        uint16_t s_reserved_gdt_blocks;  /* Per group desc for online growth */
+        uint8_t prealloc_blocks;        /* Number of blocks to try to preallocate */
+        uint8_t prealloc_dir_blocks;    /* Number to preallocate for dirs */
+        uint16_t reserved_gdt_blocks;   /* Per group desc for online growth */
         
         /*
@@ -133 +133 @@
         uint64_t last_error_block;          /* Block involved of last error */
         uint8_t last_error_func[32];        /* Function where the error happened */
-        uint8_t mount_opts[64];
-        uint32_t padding[112];              /* Padding to the end of the block */
+        uint8_t mount_opts[64];             /* String containing the mount options */
+        uint32_t usr_quota_inum;            /* Inode number of user quota file */
+        uint32_t grp_quota_inum;            /* Inode number of group quota file */
+        uint32_t overhead_blocks;           /* Overhead blocks/clusters */
+        uint32_t backup_bgs[2];             /* Block groups containing superblock backups (if SPARSE_SUPER2) */
+        uint32_t encrypt_algos;             /* Encrypt algorithm in use */
+        uint32_t padding[105];              /* Padding to the end of the block */
 } __attribute__((packed)) ext4_superblock_t;
 
@@ -176 +181 @@
 #define EXT4_FEATURE_COMPAT_RESIZE_INODE   0x0010
 #define EXT4_FEATURE_COMPAT_DIR_INDEX      0x0020
+#define EXT4_FEATURE_COMPAT_SPARSE_SUPER2  0x0200
 
 /*