From patchwork Tue Oct 11 16:39:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 680818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3stjQR3qRmz9s2G for ; Wed, 12 Oct 2016 03:39:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=pXVyrS4a; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type; q=dns; s=default; b=ZRGsYDkvbi4l+4Xm e142faddqak717SsvpHmErJx9RvKnK7lfEHACRBJTTesm8XAAI4GOg+c4nhPyWVq of1/iUDr3n9YXV5iT6eGVlW+zaLubx0cifYdLlyInzCihx32HsMCN8Mn7ppxEUFy hPFLZtbeulYCo43QmMg2aYM/ELk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type; s=default; bh=KD+cMFuCHhDFobq+T7TEx0 ntXt4=; b=pXVyrS4aezzwHFzi7mV979cqV6JyttXwXlVQ7caZ50rkIpQVxmGDh4 OIwPg/quw6dCJB7iHIVAz6Kj5pK1LymRmPSeE7fVNPSfwRMes8F1010jJbTzaEX7 OX7t9MPbS534MXyL0FzLB7XoDcnT6+v4ByOrn0KeEB6ruJMWPKxOU= Received: (qmail 97936 invoked by alias); 11 Oct 2016 16:39:50 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 97919 invoked by uid 89); 11 Oct 2016 16:39:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.2 required=5.0 tests=AWL, BAYES_20, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Hx-spam-relays-external:sk:mail-bl, H*RU:sk:mail-bl, H*RU:sk:NAM02-B, HX-HELO:sk:NAM02-B X-HELO: NAM02-BL2-obe.outbound.protection.outlook.com Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; From: Yury Norov To: CC: Yury Norov Subject: [PATCH] fcntl: define F_GETLK, F_SETLK, F_SETLKW to 64-bit versions if __OFF_T_MATCHES_OFF64_T is enabled Date: Tue, 11 Oct 2016 19:39:26 +0300 Message-ID: <1476203966-23614-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-ClientProxiedBy: AM3PR03CA040.eurprd03.prod.outlook.com (10.141.191.168) To DM3PR07MB2249.namprd07.prod.outlook.com (10.164.33.147) X-MS-Office365-Filtering-Correlation-Id: 37abaade-3d4e-4772-2a7f-08d3f1f53007 X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 2:Napz7a8ZpCsrXVDL9jy1OE+8rt/ZZQkHORTxqcVxS9s+xthBrtsQFKgv+nHf4zgyA3/0wcIBXmiXFdOaWT7qjk370ujyxHsW/iWCqrow92hNLmT6d9u9/abT9K8IG8avoJv3RA6k20KyLHuHE3ZQZQ7H7ESbr4/2kgxiNJEP/0TjOz7JL/hbOu2f8CvKXa0ufZuVw1dVMDsD+2a4nIKawg==; 3:HWoRA+rS5FeXBsFoPlsLzjf3Yo91LZw40QWKtgb2z7jdgejeDPUu8H7USKLfGNa63/7mSah09BPprmnXECo5Ab3BdO0+hjQl2N94LSUnA+NJriU50/Ta3uBAaKpHdVUeYi8RfLBRGuwHgiGtQWYEkg==; 25:0RdlfmdBk5U7DbvXKDrciemBzLmwhcyaWopljONt8oyZrqwc0S5TY7rdNHtOFQnnA2J/upSNzjvaV7AEZT4uqTwh7PsrZa9LZ6Sfs3XPpXIC+67rjFfZMW0dIJu+bhcvbM5gYjRqW4GQTrDBvX9KMTACaW225w1hiXWOHU3ltmlHU5v5H/U5MLLg12H/GfEfTaEkj5vFbRQTTNlZqJjKhL2QMSL4kQex7tI0t2f6Tki5h6G9TRJ8bR+3d8guom4qPb0ZzXWut99iipSCB/X9rsoB3vNp7I5hPI6PvBVJjZ7qFsmSLJIW3tyyYILFGwKKZOANCu9umy/y9N9iKMh9/WivW1SHV7j/5Yc2kjFELmSFW93na/aHpm/pNhGIh+YFg2McpjERqQAPndJWPXsoY1g4JTMwP9EOrXX8SoPMpRdxTzS5++owjLrvmCoON9JB X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 31:21rkL0YQOaB8wkkBqeVM4eGXPjrSXU3SuUZbLjvowH0obD1z7B3XM35SNbxdx+TG9ERR7iFiceF3ArlXeH1jMO0ONp88U1zLB9V1lfAX+rHhEi+MR+Ap1kooD99LFOMZe8EQFSfdh68uxM3XQnrUbGHwM1I4JN7fknkNgF7LPmAzH1QVqckitnoAEYr+duG1tkj3D99YR/RZGRLh3DfTR+lhqSmfvWZnsKX/ffuOp5PYTZtfcv4UNfOZJtjiljWHqLPJTkvRca5u77QGSSAu/g==; 20:+/RSh0sqIIx/HWtO5JLk3gkrKXT42pBbhgkTn7uiwE7x3VRkYBZvGK6t9o+BmBwBSV02Ogs+VZJmOE0cAU8+Pe4oW865WUKfz0tEIX5bLmp+shltGvt/7e8TpXL0bCwOMMj9EPpIpyLw/X557AVldfuy5YLHiUc2PCy0Lj/fvt+BK/3urHIFumGdi2ukso1dtkLAN7K8vugvUwfe3UsUt9PZWVLZBMtQr8bDcyF1tYgSiYpIiktDVkrhNKTJ9qimeN7YieXwvxnJ+tXEY2Pv/CP6OaTsDvqfL7S03AMvJCLAAI8KBj896ljhMG/fw/UlLAyN3y2MpJsMwZEXBH1qv/GqSNMxA0aPnzVRxPLX5OdydTGlEk/+TelNKr9rJUDEkAl5enNQkkGbz6NK9VydVFZJyGb2ai1TfujZTtcedWA1FsdOzdmXMK9bPykYTtH06V3H1wuAJ9le9a2YMPmlobhwftyHPl6nMG16KLRKmLNYYifNonXW89LT8aftBpDn0sWgMU2Wvri972DFhSN4yc/sLyBEHYNXq+e/tFg4aVLDRqqpHPgIhIHSjf3C26I2hbZkSLz1LpQYN2uNi5x9UBF2XBvOwIks9kzXQN5Xvew= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001); SRVR:DM3PR07MB2249; BCL:0; PCL:0; RULEID:; SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 4:fy54mNBgUrLOuY1Wh9AplEupfmZRxPP8BDqp0cBjROe9ozeochcOUWOZz1fUwoNqIej2Y0lNQDyuLKq10h1ghi70LHXSZnl3cTOzUMVlQ6XFNilXrqatzjavZKdJATrArfJrPbfg9NJ+1iFK5YHnTwSew+YOjfHMhFifn0RxN8VCeqsG7AL28k/gp7HdSbAcMwad94+HQUw9Us+ImIlBsJJzaNV9cu2Ml5U8K58xSHk/eTpnlUklopmEMdMuytn5oTxrC4xzcW7iMZcicN7nLEsUvMKpgqrh9axVsKcgLovEozoc+2cIktYoPO4FIP9jzRAYmaNJXr2710st/E54uTmb+rpiYsjDn5vnp6fsgNw+WRsmTg5kh828y/cYQtHrWi2T/zTDQ2Bk5RbHEjylgw== X-Forefront-PRVS: 00922518D8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(199003)(189002)(92566002)(4326007)(101416001)(48376002)(5660300001)(68736007)(110136003)(575784001)(7736002)(50226002)(305945005)(6916009)(6666003)(77096005)(36756003)(50466002)(50986999)(7846002)(66066001)(106356001)(229853001)(33646002)(105586002)(2351001)(81156014)(81166006)(450100001)(76506005)(97736004)(6116002)(586003)(4001430100002)(19580405001)(19580395003)(8676002)(47776003)(189998001)(2906002)(5003940100001)(107886002)(42186005)(3846002)(15760500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR07MB2249; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: caviumnetworks.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM3PR07MB2249; 23:YM9pLxIPHnuEHW5yukXhUnCqRIaDU1L3FH6JIxXJy?= =?us-ascii?Q?r7q0wYYcanbkK87gI2qrij0ZCnY1EG9rrp8cLeKJ9D34IaJdyE2bN7qypInf?= =?us-ascii?Q?ymcsFVhKSiQoHfZIbaFk/U837eoYbNmIbbhohDKbAoMRR5rjtYJJGTIKefE+?= =?us-ascii?Q?jQR98sTy29weVprjUdcTjhrxApFmmmN4BG+5Dd1RHV/JIigdKEhqUDRlZVZ0?= =?us-ascii?Q?0Kfs5DGwJIaiedU4W4wRjTGaJDhPWfiEanlzw068J05Rh8yy0/GUF+VRh+BR?= =?us-ascii?Q?ePFheQyPzYyTs2OsyWYm8nib4EZrBXI2VyDzDwxkB4anrf9PU4Z6sxOLVO/k?= =?us-ascii?Q?pj2+y24oF4vPL0Q2Q/cQr/NilXBrwfvaQ4TMBq6045SWfAdDFwBPf5rrtNK3?= =?us-ascii?Q?BLuVV51zzKGnsXpQsiHwYZZlll2q6rDS3HD80PVe/Igdm2NuWE7MEgAmkivF?= =?us-ascii?Q?d9+CEJmNDcKIv3i27Wv1OjB66IDsaScKwqJKcjLHEli/Bp+gbcgvjINfDPU/?= =?us-ascii?Q?VqdM/0dqlM2pB3mqAAZQhjJioNrI+Caq4k0gYl1x3zuI4KoBmUQ+q7fYQ1Mk?= =?us-ascii?Q?vlKB+xn8hQETBgCL2VgX4xVvhSxE7hO3Mi8vOj2U8AfpsAoybNnJeZ7eVgt0?= =?us-ascii?Q?RvsLv8aaBhR2vUg0iR1DsCXSuZZOstpoiO7Jw37CslswxbPCvJYvyfwVAl2d?= =?us-ascii?Q?lr7eRVBfzaIOi44HfM9FXoIeo22lTtXEdDG0IMKUa4eJQs6TnUtxj37XD+cv?= =?us-ascii?Q?Y2ayYyb7BIZAd7AY60ROuidB9kbVAemcfYzWMqHzHJtEHrFJkHSVBz1BMGxy?= =?us-ascii?Q?6KxNkmAojzkIY4RLzZwl+V6CuVTP8gokencjlj4z//xaG8GwoAJmDNHJohev?= =?us-ascii?Q?J3xd8FKxqafVuGCe3qtkTp6HhEIWKdc+tY9LeXPG0kpJciLdIqpUOe5pJ81X?= =?us-ascii?Q?jrPnvFZv/I0r7IfqdZczEet4FHJ4t5R/FDxGn/oNbF5CptCalmCa23AoZIfF?= =?us-ascii?Q?IztTadiHl9nRlIxnaAmf0S54pSp2h65ycwPXigBUkrw7mCgNrwY5END2TkXQ?= =?us-ascii?Q?kWK34w+IRj7yrNS3fNv3IsOWfPVdjbvXyWcd+2etovXhVF5o7ix/WgoxkaB0?= =?us-ascii?Q?pUp2eMIUpuG1Opu60uG9DEBg+HMLIm9dD1rjljN2oQ04YOVwMnh3PoZ9e/i8?= =?us-ascii?Q?ih8ct+Y+8IqchIxomKl3AdUyy6BvPUnLpsy8INT/Vo76OTHAi+kcgg02Q=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 6:CNvw2dTmNxDYxNPrlWJFw36UErE1fdiM+Lt8apZC/gRJOU4fhvH2OmgdZJbtsVre6wyUezzeRzearTZxoMjWQhi0Ppey2FJF8ZF2ckDRda0t4Zxx/g1iiQudN30aPpePsxALxB7StX+c7igaiYcEcoeD7s2ziIe/S1QfY7JTjDnv/yaltbU8pE1Ey05oyDammObXOwYaWQdleor8REbcrtikOou4CXR9LI+OGuCIHHTXqOEWRdb6xeFqt74MjHSuhHcgmP0QkTO86HB2BJkbuprYLq7EEIMF+wyw2HvzL8f8bYEvFaHA64QmgCzifMC1; 5:MKNUHr1cr6jG7H38Z2wXNJcMMOflmflsSpncUrDSdBl6pqzCvbcDIcbXKGzlgqax4rgzOM9d7lhVHaBWkGtiMHsIU/4dusK0WhSJppoAAM+mPIsdpsXarW7NeVjE5cGUq71r0baD2aZz6BVXuHj1PQ==; 24:OO02pU8a0hxXUeVPeZkVxHyaMGE8rWC2XNI1EW2LXWWZ9xMibzRAd0y8E+GMhxd7/pkaC+7HbEO3m2iOWQfQ9jPpD67c2Y2xptsZ9vkypjQ=; 7:VXWJT1wzbYIjr7Ep1/SYc28dPLIEHmGjy22f4DnUHoAML6QL6cFvM3o5hb2HJxXi0dp6fcskSEuHVSvDWfZA8aPu6KoUcs18qsh9ml8OE3G4H3zwXPswzBtGRpjNjHnWHiJBXNzZ2sF9YOAzEIlVGSoWcv4BB0yXy4GT00Y4QLhuC8owNpdNmYKEK4K/xUTNOugcsFJ021d1Ab/dEmKZgykW5sxKX0p27k02PUerU+swxAyY54b10lsyyeGV/YY963t/urlt+4xH7IPLiydFGZpHOEhVKULPb86xzaBBjHyMa5ECo02WI7tYTGD+tnKLz++85n+XxpzyXM5hp/0pIgw/XL1+DB5yEhE1MgxxwXo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2016 16:39:36.0856 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR07MB2249 If __OFF_T_MATCHES_OFF64_T is enabled, the behavior of sys_fcntl should be the same as if __USE_FILE_OFFSET64 is enabled. This patch adds required definitions. Tested with aarch64/lp64 and aarch64/ilp32 * sysdeps/unix/sysv/linux/bits/fcntl-linux.h: define F_GETLK, F_SETLK, F_SETLKW to 64-bit versions depending on __OFF_T_MATCHES_OFF64_T Signed-off-by: Yury Norov --- sysdeps/unix/sysv/linux/bits/fcntl-linux.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h index 7e5b0ae..2e84835 100644 --- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h +++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h @@ -101,7 +101,7 @@ #endif #ifndef F_GETLK -# ifndef __USE_FILE_OFFSET64 +# if !defined (__USE_FILE_OFFSET64) && !defined (__OFF_T_MATCHES_OFF64_T) # define F_GETLK 5 /* Get record locking info. */ # define F_SETLK 6 /* Set record locking info (non-blocking). */ # define F_SETLKW 7 /* Set record locking info (blocking). */