From patchwork Wed Jan 21 22:08:29 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1741 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1769033413; bh=fEchPZlLSgKAxntIPmbxoTlYXspruEq65dwdQgXXsbE=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=l/fuhPecFiLc38Zxyq3IbChrJTy5YktzHfRhRlS1+GqiMpiWczJC2Bpt+se2+ZSKO qtcC6s1g0EXvExma53BaKMAT9DUOsXorho+NsTmgcwvDY3Zu6tuLybGu4Swn8hUDB0 YZjYzLxNdnn7br2Mu9He/Vt6jwraj9MSzyyx5aeAuOBsTw2+khBOcz2r7xJQAl32MK c53gsAH9fzhSXGirQFJaYwWeL9bOXU2G6uKN/OFLkW9zAdUVFFZTmdCHqQrWQ4ySFv z46lm95MW7lykMSBvWHjkpTDgm5NZUgmZ9I1p9mi5HK2yBD5P1sdBEZ0PNRCGXw3Sh 22HaH71jXZaaA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id D4E0269601 for ; Wed, 21 Jan 2026 15:10:13 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id g-ZAefsEP_IF for ; Wed, 21 Jan 2026 15:10:13 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1769033413; bh=fEchPZlLSgKAxntIPmbxoTlYXspruEq65dwdQgXXsbE=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=l/fuhPecFiLc38Zxyq3IbChrJTy5YktzHfRhRlS1+GqiMpiWczJC2Bpt+se2+ZSKO qtcC6s1g0EXvExma53BaKMAT9DUOsXorho+NsTmgcwvDY3Zu6tuLybGu4Swn8hUDB0 YZjYzLxNdnn7br2Mu9He/Vt6jwraj9MSzyyx5aeAuOBsTw2+khBOcz2r7xJQAl32MK c53gsAH9fzhSXGirQFJaYwWeL9bOXU2G6uKN/OFLkW9zAdUVFFZTmdCHqQrWQ4ySFv z46lm95MW7lykMSBvWHjkpTDgm5NZUgmZ9I1p9mi5HK2yBD5P1sdBEZ0PNRCGXw3Sh 22HaH71jXZaaA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id C16E2695FB for ; Wed, 21 Jan 2026 15:10:13 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1769033411; bh=Y1VdIJsUMTyRfxglx/zNJempdK0BBOo9enGCUs7OBVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q9dwrT8H7oYTCpugu02f4ynV1448+OvkgRqPpah+oo52zeaUCBnvJPkzJT+g459TO KDjoIbpC/6BR4kty6U4FArixKScjBJzjGg0mtur9JGmAig4gwZvXvJ4LUOOdWkVpBK bllhLMdOj37UNWtSSzOwVRsO/Igs686ePOVdI+I9x+7eD+OfkZq++1qjm4qmMRu4eM vRciMJhEgizCxMszz0hB/oOr06LdN6muLm7FNXKDJmTnW/8ZSryzq1qtXKidF0OIAR OiluBAwH1E14tKjWEsJVni5wp2nsTukhvBkmoRDOjZVaRitassEHZkYtmXcoWt8m3t InPpudJJgGcFA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id C790A69601; Wed, 21 Jan 2026 15:10:11 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id 6gwt5BO3xrGt; Wed, 21 Jan 2026 15:10:11 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1769033410; bh=ukkxcpWR3UbdQluLZe6bROTVqIhpvg5u/2BIgI/Z5vs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qwsQwD4IjIeD7hnMcVGooclKUCMZby7y9vbWWoOnsi6MjEhqNLxh3jf1Mv0zf1WdA UOq3eblN30yjQebt82ONVA6TjD39HeTE2ZPkKYBPjwdMbAgJdqxo69K1bA8I4aGtmu STv87LjfaZPS0hcRGf54HNJ+0AFH0r8YD0F2OmDlzUW7DYdyWT/y+vYPTqj9fjJ/i9 PXSSGvGlyXFgJxse8XTZeFaPUW2Za9Vhkfe37KfNllPHWcgyiCFlmJlWnqXjETcEh/ uH1ClixAa/vFe1Bx9r84q0dhVqg0isiZeXF1rRbK4nEPLVb0DWCPuuW46itikhnDng uFMfJw4e96YpQ== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 3B101695F7; Wed, 21 Jan 2026 15:10:10 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Wed, 21 Jan 2026 15:08:29 -0700 Message-ID: <20260121220857.2137568-17-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260121220857.2137568-1-sjg@u-boot.org> References: <20260121220857.2137568-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: ONXVJRGTXQGIDCXEK5WWYU4MGB7EONRZ X-Message-ID-Hash: ONXVJRGTXQGIDCXEK5WWYU4MGB7EONRZ X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass , "Claude Opus 4 . 5" X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 16/33] ext4l: Consolidate DX_HASH_* into EXT4_UBOOT_NO_EXT4_H block List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass 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 Signed-off-by: Simon Glass --- fs/ext4l/ext4_uboot.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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)