From patchwork Mon Apr 24 20:29:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 9697179 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 4E0D4603F2 for ; Mon, 24 Apr 2017 20:29:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 424CB1FF61 for ; Mon, 24 Apr 2017 20:29:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37008283F9; Mon, 24 Apr 2017 20:29:53 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 B55A61FF61 for ; Mon, 24 Apr 2017 20:29:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S969292AbdDXU3v (ORCPT ); Mon, 24 Apr 2017 16:29:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44926 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968818AbdDXU3r (ORCPT ); Mon, 24 Apr 2017 16:29:47 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DA1B923E6C5; Mon, 24 Apr 2017 20:29:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DA1B923E6C5 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=sandeen@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com DA1B923E6C5 Received: from dhcp80-213.msp.redhat.com (ovpn04.gateway.prod.ext.phx2.redhat.com [10.5.9.4]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A19088F11; Mon, 24 Apr 2017 20:29:46 +0000 (UTC) To: linux-xfs From: Eric Sandeen Subject: [PATCH] xfs_io: fix statx definition for non-x86 architecture Cc: Gwendal Grignou Message-ID: <52721b67-60e0-0570-0e90-282e4d525797@redhat.com> Date: Mon, 24 Apr 2017 15:29:45 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 24 Apr 2017 20:29:47 +0000 (UTC) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Apply the same fix to xfs_io as Gwendal did for fstests: Fix a compilation error for ARM: __ILP32__ is defined but not __X32_SYSCALL_BIT. The check should only apply for x86_64 architecture, statx for other architectures is not implemented yet - see commit 7acc839c9e57 "statx: Add a system call to make enhanced file info available". Signed-off-by: Gwendal Grignou Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig --- -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" 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/io/statx.h b/io/statx.h index ff08e27..eea7944 100644 --- a/io/statx.h +++ b/io/statx.h @@ -18,10 +18,12 @@ #ifndef __NR_statx # ifdef __i386__ # define __NR_statx 383 -# elif defined (__ILP32__) -# define __NR_statx (__X32_SYSCALL_BIT + 332) # elif defined (__x86_64__) -# define __NR_statx 332 +# if defined (__ILP32__) +# define __NR_statx (__X32_SYSCALL_BIT + 332) +# else +# define __NR_statx 332 +# endif # endif #endif