From: Darrick J. Wong Date: Sun, 20 Dec 2015 23:54:40 +0000 (+1100) Subject: libxfs: pack the agfl header structure so XFS_AGFL_SIZE is correct X-Git-Tag: v4.5.0-rc1~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9fccb9f6deaacab250653dc1ccf7099c58e999a9;p=thirdparty%2Fxfsprogs-dev.git libxfs: pack the agfl header structure so XFS_AGFL_SIZE is correct Because struct xfs_agfl is 36 bytes long and has a 64-bit integer inside it, gcc will quietly round the structure size up to the nearest 64 bits -- in this case, 40 bytes. This results in the XFS_AGFL_SIZE macro returning incorrect results for v5 filesystems on 64-bit machines (118 items instead of 119). As a result, a 32-bit xfs_repair will see garbage in AGFL item 119 and complain. Therefore, tell gcc not to pad the structure so that the AGFL size calculation is correct. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h index c0e1b7090..a35009a49 100644 --- a/libxfs/xfs_format.h +++ b/libxfs/xfs_format.h @@ -787,7 +787,7 @@ typedef struct xfs_agfl { __be64 agfl_lsn; __be32 agfl_crc; __be32 agfl_bno[]; /* actually XFS_AGFL_SIZE(mp) */ -} xfs_agfl_t; +} __attribute__((packed)) xfs_agfl_t; #define XFS_AGFL_CRC_OFF offsetof(struct xfs_agfl, agfl_crc)