[Concept,16/33] ext4l: Consolidate DX_HASH_* into EXT4_UBOOT_NO_EXT4_H block

Message ID 20260121220857.2137568-17-sjg@u-boot.org
State New
Headers
Series Reorganise ext4l compatibility stubs |

Commit Message

Simon Glass Jan. 21, 2026, 10:08 p.m. UTC
  From: Simon Glass <simon.glass@canonical.com>

The DX_HASH_* and EXT4_HTREE_EOF_* constants are already defined in
ext4.h. Move them inside the EXT4_UBOOT_NO_EXT4_H conditional block so
they are only defined for files like hash.c that do not include ext4.h.

Also merge adjacent EXT4_UBOOT_NO_EXT4_H blocks for cleaner code.

This reduces ext4_uboot.h from 528 to 526 lines.

Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
---

 fs/ext4l/ext4_uboot.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
  

Patch

diff --git a/fs/ext4l/ext4_uboot.h b/fs/ext4l/ext4_uboot.h
index e21732da843..7356ddb6213 100644
--- a/fs/ext4l/ext4_uboot.h
+++ b/fs/ext4l/ext4_uboot.h
@@ -173,8 +173,8 @@  struct path;
 /* QSTR_INIT and dotdot_name are now in linux/dcache.h */
 
 /*
- * Hash info structure - defined in ext4.h.
- * Only defined here for files that don't include ext4.h (like hash.c)
+ * Hash info structure and constants - defined in ext4.h.
+ * Only defined here for files that don't include ext4.h (like hash.c).
  * This is wrapped in EXT4_UBOOT_NO_EXT4_H which hash.c defines.
  */
 #ifdef EXT4_UBOOT_NO_EXT4_H
@@ -184,7 +184,6 @@  struct dx_hash_info {
 	int hash_version;
 	u32 *seed;
 };
-#endif
 
 /* Hash algorithm types */
 #define DX_HASH_LEGACY			0
@@ -200,7 +199,6 @@  struct dx_hash_info {
 #define EXT4_HTREE_EOF_32BIT   ((1UL  << (32 - 1)) - 1)
 #define EXT4_HTREE_EOF_64BIT   ((1ULL << (64 - 1)) - 1)
 
-#ifdef EXT4_UBOOT_NO_EXT4_H
 #define ext4_warning(sb, fmt, ...) \
 	do { } while (0)