Re: [PATCH RESEND 13/62] ext2: remove ext2_image_size and associated code

Jan Kara <[email protected]> Mon, 15 Sep 2025 11:19:38 +0200
Newsgroups org.kernel.vger.initramfs,dev.linux.lists.loongarch,dev.linux.lists.patches,org.infradead.lists.linux-riscv,org.infradead.lists.linux-snps-arc,org.infradead.lists.linux-um,org.kernel.vger.linux-acpi,org.kernel.vger.linux-alpha,org.kernel.vger.linux-api,org.kernel.vger.linux-arch,org.kernel.vger.linux-block,org.kernel.vger.linux-csky,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-doc,org.kernel.vger.linux-efi,org.kernel.vger.linux-ext4,org.kernel.vger.linux-fsdevel,org.kernel.vger.linux-hexagon,org.kernel.vger.linux-kernel,org.kernel.vger.linux-m68k,org.kernel.vger.linux-mips,org.kernel.vger.linux-openrisc,org.kernel.vger.linux-parisc,org.kernel.vger.linux-s390,org.kernel.vger.linux-sh,org.kernel.vger.sparclinux,org.ozlabs.lists.linuxppc-dev
Message-ID <5xr5efvf4dhy43fchbvfsxspzgde5bxezhszdgqcya4eqrocgy@lqqkaq5wok6a> 
On Sat 13-09-25 00:37:52, Askar Safin wrote:
> It is not used anymore
> 
> Signed-off-by: Askar Safin <[email protected]>

Looks good.

Acked-by: Jan Kara <[email protected]>

								Honza

> ---
>  fs/ext2/ext2.h          |  9 ---------
>  include/linux/ext2_fs.h | 13 -------------
>  2 files changed, 22 deletions(-)
> 
> diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h
> index cf97b76e9fd3..d623a14040d9 100644
> --- a/fs/ext2/ext2.h
> +++ b/fs/ext2/ext2.h
> @@ -608,15 +608,6 @@ struct ext2_dir_entry_2 {
>  					 ~EXT2_DIR_ROUND)
>  #define EXT2_MAX_REC_LEN		((1<<16)-1)
>  
> -static inline void verify_offsets(void)
> -{
> -#define A(x,y) BUILD_BUG_ON(x != offsetof(struct ext2_super_block, y));
> -	A(EXT2_SB_MAGIC_OFFSET, s_magic);
> -	A(EXT2_SB_BLOCKS_OFFSET, s_blocks_count);
> -	A(EXT2_SB_BSIZE_OFFSET, s_log_block_size);
> -#undef A
> -}
> -
>  /*
>   * ext2 mount options
>   */
> diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
> index 1fef88569037..e5ebe6cdf06c 100644
> --- a/include/linux/ext2_fs.h
> +++ b/include/linux/ext2_fs.h
> @@ -27,17 +27,4 @@
>   */
>  #define EXT2_LINK_MAX		32000
>  
> -#define EXT2_SB_MAGIC_OFFSET	0x38
> -#define EXT2_SB_BLOCKS_OFFSET	0x04
> -#define EXT2_SB_BSIZE_OFFSET	0x18
> -
> -static inline u64 ext2_image_size(void *ext2_sb)
> -{
> -	__u8 *p = ext2_sb;
> -	if (*(__le16 *)(p + EXT2_SB_MAGIC_OFFSET) != cpu_to_le16(EXT2_SUPER_MAGIC))
> -		return 0;
> -	return (u64)le32_to_cpup((__le32 *)(p + EXT2_SB_BLOCKS_OFFSET)) <<
> -		le32_to_cpup((__le32 *)(p + EXT2_SB_BSIZE_OFFSET));
> -}
> -
>  #endif	/* _LINUX_EXT2_FS_H */
> -- 
> 2.47.2
> 
-- 
Jan Kara <[email protected]>
SUSE Labs, CR