Browse Source

Ext4Pkg: Fix bug in EXT4_HAS_GDT_CSUM

Caught when running clang-tidy on this code. Also tidies up some logic
in BlockGroup.c

Cc: Marvin Häuser <mhaeuser@posteo.de>
Signed-off-by: Pedro Falcato <pedro.falcato@gmail.com>
Reviewed-by: Marvin Häuser <mhaeuser@posteo.de>
Pedro Falcato 1 year ago
parent
commit
bcad50b813
2 changed files with 3 additions and 3 deletions
  1. 2 2
      Features/Ext4Pkg/Ext4Dxe/BlockGroup.c
  2. 1 1
      Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h

+ 2 - 2
Features/Ext4Pkg/Ext4Dxe/BlockGroup.c

@@ -218,9 +218,9 @@ Ext4CalculateBlockGroupDescChecksum (
   IN UINT32                       BlockGroupNum
   )
 {
-  if ((Partition->FeaturesRoCompat & EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) != 0) {
+  if (EXT4_HAS_METADATA_CSUM (Partition)) {
     return Ext4CalculateBlockGroupDescChecksumMetadataCsum (Partition, BlockGroupDesc, BlockGroupNum);
-  } else if ((Partition->FeaturesRoCompat & EXT4_FEATURE_RO_COMPAT_GDT_CSUM) != 0) {
+  } else if (EXT4_HAS_GDT_CSUM (Partition)) {
     return Ext4CalculateBlockGroupDescChecksumGdtCsum (Partition, BlockGroupDesc, BlockGroupNum);
   }
 

+ 1 - 1
Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h

@@ -1095,7 +1095,7 @@ Ext4CalculateBlockGroupDescChecksum (
    @return TRUE if the gdt_csum is supported, else FALSE.
 **/
 #define EXT4_HAS_GDT_CSUM(Partition)                                           \
-  EXT4_HAS_RO_COMPAT(Partition, EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)
+  EXT4_HAS_RO_COMPAT(Partition, EXT4_FEATURE_RO_COMPAT_GDT_CSUM)
 
 /**
    Retrieves the volume name.