From patchwork Wed Jan 24 23:53:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10183355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4D953601E8 for ; Wed, 24 Jan 2018 23:53:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B23C28994 for ; Wed, 24 Jan 2018 23:53:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2FEDA289B2; Wed, 24 Jan 2018 23:53:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A32F228994 for ; Wed, 24 Jan 2018 23:53:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932239AbeAXXxf (ORCPT ); Wed, 24 Jan 2018 18:53:35 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:60110 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932251AbeAXXxe (ORCPT ); Wed, 24 Jan 2018 18:53:34 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w0ONrRhS001003; Wed, 24 Jan 2018 23:53:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2017-10-26; bh=pOAg3UbYb0VPCYysEAmOmVP5c28bVlxNRSI4tJrIPqE=; b=aF/2/a5W2l43tt7YT0YNl8mpo6EuCf23DiXW4ZNr76uZJ5Lm1pRboWM9JO+MYqAdrTmm gnx6v0J5rUKE+SPNQ/yoBAdT7CqAtK0R3as5ZF8jv6s9jsvXvDhXiUopOEOYFJ1dkyla 1f/oN16w6WJjlnH9Le0HEZQwzp4pPDA2bop+T32TbVMX1X7QQqAN+WPLuesbcBmbqiEG BbG5G3LdMfUDizVGTUanN7x10ybb5DgTIWaJbWdc7ml7egS/qDOFnJ/JGHS3cMuiM1jI LUKZ7WxpvQ611QAiFkTEUfJl7gxj7huiXV+rdPQ1eZK6UbZd6wtis6aUL6Ai8dBt30lw ow== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp2130.oracle.com with ESMTP id 2fq3qyr3f8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jan 2018 23:53:32 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w0ONrVJe017341 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 24 Jan 2018 23:53:31 GMT Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w0ONrVTY021429; Wed, 24 Jan 2018 23:53:31 GMT Received: from localhost (/10.159.137.211) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 24 Jan 2018 15:53:30 -0800 Subject: [PATCH 2/5] xfs/122: fix xfs header ordering problems From: "Darrick J. Wong" To: eguan@redhat.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Wed, 24 Jan 2018 15:53:29 -0800 Message-ID: <151683800942.17051.13963517513340805990.stgit@magnolia> In-Reply-To: <151683799705.17051.9987269343206294671.stgit@magnolia> References: <151683799705.17051.9987269343206294671.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8784 signatures=668655 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=872 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1801240311 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong 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 --- 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 --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 +# 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