Commit d385f15d authored by Gao Xiang's avatar Gao Xiang
Browse files

erofs: add __packed annotation to union(__le16..) 



I'm unsure why they aren't 2 bytes in size only in arm-linux-gnueabi.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/r/202504051202.DS7QIknJ-lkp@intel.com


Fixes: 61ba89b5 ("erofs: add 48-bit block addressing on-disk support")
Fixes: efb2aef5 ("erofs: add encoded extent on-disk definition")
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20250408114448.4040220-1-hsiangkao@linux.alibaba.com
parent 1595f153

fs/erofs/erofs_fs.h

+4 −4
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct erofs_super_block { 
	union {

		__le16 rootnid_2b;	/* nid of root directory */

		__le16 blocks_hi;	/* (48BIT on) blocks count MSB */

	} rb;

	} __packed rb;

	__le64 inos;            /* total valid ino # (== f_files - f_favail) */

	__le64 epoch;		/* base seconds used for compact inodes */

	__le32 fixed_nsec;	/* fixed nanoseconds for compact inodes */
@@ -148,7 +148,7 @@ union erofs_inode_i_nb { 
	__le16 nlink;		/* if EROFS_I_NLINK_1_BIT is unset */

	__le16 blocks_hi;	/* total blocks count MSB */

	__le16 startblk_hi;	/* starting block number MSB */

};

} __packed;



/* 32-byte reduced form of an ondisk inode */

struct erofs_inode_compact {
@@ -369,9 +369,9 @@ struct z_erofs_map_header { 
			 * bit 7   : pack the whole file into packed inode

			 */

			__u8	h_clusterbits;

		};

		} __packed;

		__le16 h_extents_hi;	/* extent count MSB */

	};

	} __packed;

};



enum {