From a6b5c98da8c4b47831752657ef010b17622c8dd7 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Wed, 24 Jan 2018 15:53:29 -0800 Subject: [PATCH] xfs/122: fix xfs header ordering problems XFS headers are supposed to be included in a certain order so that inline functions actually compile correctly. For the most part the shell feeds us the files in an order that works, but with the addition of the xfs_dir2_dirblock_bytes function this doesn't always work now. Therefore, explicitly #include the headers in the required order. Signed-off-by: Darrick J. Wong Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- tests/xfs/122 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/xfs/122 b/tests/xfs/122 index 671a77bc..d8366701 100755 --- a/tests/xfs/122 +++ b/tests/xfs/122 @@ -79,6 +79,11 @@ cat >$cprog < EOF +# Certain headers must be included in a certain order... +for hdr in xfs.h xfs_types.h xfs_fs.h xfs_arch.h xfs_format.h; do + test -e "/usr/include/xfs/$hdr" && echo "#include " >> $cprog +done +# ...but be sure to pull in any new headers that might show up. for hdr in /usr/include/xfs/xfs*.h; do echo "#include <$(echo "$hdr" | sed -e 's|/usr/include/||g')>" >> $cprog done -- 2.47.3