Message ID | 20200826153753.1649367-1-alistair.francis@wdc.com |
---|---|
State | Committed |
Headers |
Return-Path: <libc-alpha-bounces@sourceware.org> X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7CD91386F413; Wed, 26 Aug 2020 15:48:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7CD91386F413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1598456897; bh=jUfQ+6E5LtELaxBiG8QJPJpCmpSgjWlv68lmDiwgGEQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=u6SHJYam06r+mK4VIF2IqS+wrfkbVcvKehtviz5/D3171f/zT5n5kNxTjCT44gWSa +HpuLOV01fgTyDHeSVMWM5KPECljHfeXY0YegSIWgjSgpxsOzGMWzKrYD/cAezm5Fq 3836NsS42BhXD0ZSeVFJCAXY5ctdlfhHZLjk50eo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa3.hgst.iphmx.com (esa3.hgst.iphmx.com [216.71.153.141]) by sourceware.org (Postfix) with ESMTPS id 6571638618A5 for <libc-alpha@sourceware.org>; Wed, 26 Aug 2020 15:48:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6571638618A5 IronPort-SDR: l1MdKep7XFAtYAYje/hTVR4rBCvVYnL5Bi8aq6rTUCK38UPqnFEy3lvreLM4VD/dnRQnI8CYqX y1s9ZaZ1XTiI9x1EAcavn94hnIA+b08oCVprSMvYINtCAiDOSYmcWIoyqLX+TcNRa6DNN8OYOa wtHyIpWIifry66vl3lgvak91AAcp7mv+2hgxYUoKPRggB25tc/VV1m4GRA1BiPHeKUkDw8RYiq y5YgeaY5DczqqMaLk0hPXkhWqMhJnsCGwLCzNUIliKAiYDIYoCE+AXuaIuWum7PX9whp6QbArv IBE= X-IronPort-AV: E=Sophos;i="5.76,356,1592841600"; d="scan'208";a="150220895" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 26 Aug 2020 23:48:13 +0800 IronPort-SDR: NiWNrgNL9Bh6rGuD8u+NfvkuwaUMxyE42iVM68ZyGaV7ZZ8gO+sZQGZXCQu+fPQABhTx471vlj qf01I6Ex8BlQ== Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2020 08:34:59 -0700 IronPort-SDR: ew84l8h1o2vAh/9QrwYSQgofOE5eCL8WouuakDQ6nDV1tQyQBga8QKWNrqizvmSvewbS/ftInE i9UogI0vjWPg== WDCIronportException: Internal Received: from usa003387.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.59.162]) by uls-op-cesaip02.wdc.com with ESMTP; 26 Aug 2020 08:48:13 -0700 To: libc-alpha@sourceware.org Subject: [PATCH] io/lockf: Include bits/types.h before __OFF_T_MATCHES_OFF64_T check Date: Wed, 26 Aug 2020 08:37:53 -0700 Message-Id: <20200826153753.1649367-1-alistair.francis@wdc.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list <libc-alpha.sourceware.org> List-Unsubscribe: <https://sourceware.org/mailman/options/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe> List-Archive: <https://sourceware.org/pipermail/libc-alpha/> List-Post: <mailto:libc-alpha@sourceware.org> List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help> List-Subscribe: <https://sourceware.org/mailman/listinfo/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=subscribe> From: Alistair Francis via Libc-alpha <libc-alpha@sourceware.org> Reply-To: Alistair Francis <alistair.francis@wdc.com> Cc: alistair.francis@wdc.com Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces@sourceware.org> |
Series |
io/lockf: Include bits/types.h before __OFF_T_MATCHES_OFF64_T check
|
|
Commit Message
Alistair Francis
Aug. 26, 2020, 3:37 p.m. UTC
It's possible that although __OFF_T_MATCHES_OFF64_T is defined the
included the relevent header file. This results in a io/tst-lockf
failure for RV32 by calling the non 64-bit version of lockf. This
patch fixes the failure by including bits/types.h.
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
io/lockf.c | 2 ++
1 file changed, 2 insertions(+)
Comments
On 26/08/2020 12:37, Alistair Francis via Libc-alpha wrote: > It's possible that although __OFF_T_MATCHES_OFF64_T is defined the > included the relevent header file. This results in a io/tst-lockf > failure for RV32 by calling the non 64-bit version of lockf. This > patch fixes the failure by including bits/types.h. > > Signed-off-by: Alistair Francis <alistair.francis@wdc.com> We don't use DCO, but rather Copyright assignment. LGTM, thanks. As a side note, I think it would be good to move __OFF_T_MATCHES_OFF64_T to be *always* defined. It would get this issue early. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > --- > io/lockf.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/io/lockf.c b/io/lockf.c > index aa5c673c8d..8ea83e15f0 100644 > --- a/io/lockf.c > +++ b/io/lockf.c > @@ -15,6 +15,8 @@ > License along with the GNU C Library; if not, see > <https://www.gnu.org/licenses/>. */ > > +#include <bits/types.h> > + > #ifndef __OFF_T_MATCHES_OFF64_T > > #include <unistd.h> >
diff --git a/io/lockf.c b/io/lockf.c index aa5c673c8d..8ea83e15f0 100644 --- a/io/lockf.c +++ b/io/lockf.c @@ -15,6 +15,8 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ +#include <bits/types.h> + #ifndef __OFF_T_MATCHES_OFF64_T #include <unistd.h>