]> git.hungrycats.org Git - linux/commit
libxfs: pack the agfl header structure so XFS_AGFL_SIZE is correct
authorDarrick J. Wong <darrick.wong@oracle.com>
Mon, 4 Jan 2016 05:13:21 +0000 (16:13 +1100)
committerJiri Slaby <jslaby@suse.cz>
Thu, 25 Feb 2016 09:49:19 +0000 (10:49 +0100)
commit811848048f1e4d74efaf299b0eba05ef50bc3e4f
treeceeda0a3ac289b20fc75666fca3d08c320d6266c
parent9aa1d60820b8fb0ce71d2ee7e406836c86ab55e9
libxfs: pack the agfl header structure so XFS_AGFL_SIZE is correct

commit 96f859d52bcb1c6ea6f3388d39862bf7143e2f30 upstream.

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 <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
fs/xfs/xfs_ag.h