Skip to content

Commit

Permalink
erofs: add __packed annotation to union(__le16..)
Browse files Browse the repository at this point in the history
I'm unsure why they aren't 2 bytes in size only in arm-linux-gnueabi.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/r/202504051202.DS7QIknJ-lkp@intel.com
Fixes: 61ba89b ("erofs: add 48-bit block addressing on-disk support")
Fixes: efb2aef ("erofs: add encoded extent on-disk definition")
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20250408114448.4040220-1-hsiangkao@linux.alibaba.com
  • Loading branch information
Gao Xiang committed Apr 9, 2025
1 parent 1595f15 commit d385f15
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fs/erofs/erofs_fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit d385f15

Please sign in to comment.