diff mbox

[2/5] xfs/122: fix xfs header ordering problems

Message ID 151683800942.17051.13963517513340805990.stgit@magnolia (mailing list archive)
State New, archived
Headers show

Commit Message

Darrick J. Wong Jan. 24, 2018, 11:53 p.m. UTC 
From: Darrick J. Wong <darrick.wong@oracle.com>

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 <darrick.wong@oracle.com>
---
 tests/xfs/122 |    5 +++++
 1 file changed, 5 insertions(+)



--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/tests/xfs/122 b/tests/xfs/122
index 671a77b..d836670 100755
--- a/tests/xfs/122
+++ b/tests/xfs/122
@@ -79,6 +79,11 @@  cat >$cprog <<EOF
 #define _GNU_SOURCE
 #include <stdio.h>
 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 <xfs/$hdr>" >> $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