Rename 'initialize_dir_tail' to 'ext4_dir_init_entry_tail'

[lwext4.git] / lwext4 / ext4_super.c

diff --git a/lwext4/ext4_super.c b/lwext4/ext4_super.c
index cfe7b53332626103dd121a440733a56897cfd5b4..a9a68bd9e2f41158e95e5f99b8d31c757f4cfd6c 100644 (file)
--- a/lwext4/ext4_super.c
+++ b/lwext4/ext4_super.c
@@ -80,16 +80,20 @@ uint32_t ext4_inodes_in_group_cnt(struct ext4_sblock *s, uint32_t bgid)
        return (total_inodes - ((block_group_count - 1) * inodes_per_group));
 }
 
+#if CONFIG_META_CSUM_ENABLE
 static uint32_t ext4_sb_csum(struct ext4_sblock *s)
 {
-       return ext4_crc32c(~0, s,
-                       ext4_offsetof(struct ext4_sblock, checksum));
+
+       return ext4_crc32c(EXT4_CRC32_INIT, s,
+                       offsetof(struct ext4_sblock, checksum));
 }
+#else
+#define ext4_sb_csum(...) 0
+#endif
 
 static bool ext4_sb_verify_csum(struct ext4_sblock *s)
 {
-       if (!ext4_sb_has_feature_read_only(s,
-                                          EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+       if (!ext4_sb_feature_ro_com(s, EXT4_FRO_COM_METADATA_CSUM))
                return true;
 
        if (s->checksum_type != to_le32(EXT4_CHECKSUM_CRC32C))
@@ -100,8 +104,7 @@ static bool ext4_sb_verify_csum(struct ext4_sblock *s)
 
 static void ext4_sb_set_csum(struct ext4_sblock *s)
 {
-       if (!ext4_sb_has_feature_read_only(s,
-                                          EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+       if (!ext4_sb_feature_ro_com(s, EXT4_FRO_COM_METADATA_CSUM))
                return;
 
        s->checksum = to_le32(ext4_sb_csum(s));
@@ -182,8 +185,7 @@ bool ext4_sb_sparse(uint32_t group)
 
 bool ext4_sb_is_super_in_bg(struct ext4_sblock *s, uint32_t group)
 {
-       if (ext4_sb_has_feature_read_only(
-               s, EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER) &&
+       if (ext4_sb_feature_ro_com(s, EXT4_FRO_COM_SPARSE_SUPER) &&
            !ext4_sb_sparse(group))
                return false;
        return true;
@@ -213,7 +215,7 @@ static uint32_t ext4_bg_num_gdb_nometa(struct ext4_sblock *s, uint32_t group)
        uint32_t db_count =
            (ext4_block_group_cnt(s) + dsc_per_block - 1) / dsc_per_block;
 
-       if (ext4_sb_has_feature_incompatible(s, EXT4_FEATURE_INCOMPAT_META_BG))
+       if (ext4_sb_feature_incom(s, EXT4_FINCOM_META_BG))
                return ext4_sb_first_meta_bg(s);
 
        return db_count;
@@ -226,8 +228,7 @@ uint32_t ext4_bg_num_gdb(struct ext4_sblock *s, uint32_t group)
        uint32_t first_meta_bg = ext4_sb_first_meta_bg(s);
        uint32_t metagroup = group / dsc_per_block;
 
-       if (!ext4_sb_has_feature_incompatible(s,
-                                             EXT4_FEATURE_INCOMPAT_META_BG) ||
+       if (!ext4_sb_feature_incom(s,EXT4_FINCOM_META_BG) ||
            metagroup < first_meta_bg)
                return ext4_bg_num_gdb_nometa(s, group);
 
@@ -243,8 +244,7 @@ uint32_t ext4_num_base_meta_clusters(struct ext4_sblock *s,
 
        num = ext4_sb_is_super_in_bg(s, block_group);
 
-       if (!ext4_sb_has_feature_incompatible(s,
-                                             EXT4_FEATURE_INCOMPAT_META_BG) ||
+       if (!ext4_sb_feature_incom(s, EXT4_FINCOM_META_BG) ||
            block_group < ext4_sb_first_meta_bg(s) * dsc_per_block) {
                if (num) {
                        num += ext4_bg_num_gdb(s, block_group);