From patchwork Sat Jun 14 09:31:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Radko_Krko=C5=A1?= X-Patchwork-Id: 114476 Return-Path: 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 3901338E1A92 for ; Sat, 14 Jun 2025 09:31:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3901338E1A92 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=mail.muni.cz header.i=@mail.muni.cz header.a=rsa-sha256 header.s=20230216 header.b=j5uF0D15 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from arethusa2.fi.muni.cz (arethusa2.fi.muni.cz [147.251.49.7]) by sourceware.org (Postfix) with ESMTPS id BAE2438560BC for ; Sat, 14 Jun 2025 09:31:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BAE2438560BC Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=mail.muni.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mail.muni.cz ARC-Filter: OpenARC Filter v1.0.0 sourceware.org BAE2438560BC Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=147.251.49.7 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1749893462; cv=none; b=kXypcpVdDSm9BmjbNgbcbemM4ArpBxOkpsZjWJo4i1ChQkRPiCsNkY2ZlMOlniZxC7Skj35ctTonVu32qOUh7iwP5m/yQfVLqO2+jcpiH+3CG6Y6mCKJAq4B8iDqe+pEafo3kABJ5vRBKXSsGCaPaxLI0GQYWG0sBVaHOhjqWQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1749893462; c=relaxed/simple; bh=9kRrB38MQqclUjhacd6MK77UolHm3NIUEnp8anZCQx0=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=dmNSNVQnd3uVutVlRsNndwxNyfB88WGfLfPUNOFecXFMLf3stlqqVS4n4VAmFUSqvv9YsTIEX6mqtnEi7t4EofiiR9yth+ZejbI5SAvkYgA9upHYYQC1p4bv0UAnFKiRc971x8zcdGMHBSAoUbXJARQ91zS654tjmXSrBwW+sHA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BAE2438560BC Received: from [147.229.181.194] (dhcpf194.fit.vutbr.cz [147.229.181.194]) by arethusa2.fi.muni.cz (Postfix) with ESMTPSA id B674E1E00FB; Sat, 14 Jun 2025 11:30:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.muni.cz; s=20230216; t=1749893459; bh=vlvTU4XwlyZtO9cbCLMwI4lT0kBnULmd9iFTembowts=; h=Date:To:Cc:From:Subject:From; b=j5uF0D154VjuUTBerEnM194LTpcpfElPmwLA+mHOL1KJMHvPoYMPv56gJ1kahPD2b 3oXkACiA2zvgv2sQBRh7ydKXBEeptxFsA+LpG6tUTD9V0BJKOO4PgiNIHphRnSi54c CLoDA0vXUGd6bRnavkBkXVQNIaUM8nHiSRuzNL7BwEckz3cZaRutnHsZuUg4Y/wgUZ A3vCfQQcjTfZJipNpTToNj2uhNdxJ5K09grgHZdPFMGc+5V4ZugfqSoxvmk3lTvdHa STL0Pxa6GSS1eE4aQ7+Zr14UUxDgT+yNNV7tw8Sz9rEzNqtLBWUUKHTop4uPQ90xqp Rb74SV/kIYfKQ== Message-ID: <982b505e-bda5-49d6-b977-2de62aeccff9@mail.muni.cz> Date: Sat, 14 Jun 2025 11:31:02 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: libc-alpha@sourceware.org Cc: arjun@redhat.com From: =?utf-8?q?Radko_Krko=C5=A1?= Subject: [PATCH] io: Mark lockf() __wur [BZ #32800] X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org In commit 0476597b28 flock() was marked __wur in posix/unistd.h, but not in io/fcntl.h, the declarations must match. Reviewed-by: Florian Weimer --- io/fcntl.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) #endif From 154ccecedf83332c38d97d4b98500b673523bc80 Mon Sep 17 00:00:00 2001 From: Radko Krkos Date: Sat, 14 Jun 2025 11:07:40 +0200 Subject: [PATCH] io: Mark lockf() __wur [BZ #32800] In commit 0476597b28 flock() was marked __wur in posix/unistd.h, but not in io/fcntl.h, the declarations must match. --- io/fcntl.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/io/fcntl.h b/io/fcntl.h index 59dc7d4c51..132d83a371 100644 --- a/io/fcntl.h +++ b/io/fcntl.h @@ -281,16 +281,17 @@ extern int creat64 (const char *__file, mode_t __mode) __nonnull ((1)); # define F_TEST 3 /* Test a region for other processes locks. */ # ifndef __USE_FILE_OFFSET64 -extern int lockf (int __fd, int __cmd, off_t __len); +extern int lockf (int __fd, int __cmd, off_t __len) __wur; # else # ifdef __REDIRECT -extern int __REDIRECT (lockf, (int __fd, int __cmd, __off64_t __len), lockf64); +extern int __REDIRECT (lockf, (int __fd, int __cmd, __off64_t __len), + lockf64) __wur; # else # define lockf lockf64 # endif # endif # ifdef __USE_LARGEFILE64 -extern int lockf64 (int __fd, int __cmd, off64_t __len); +extern int lockf64 (int __fd, int __cmd, off64_t __len) __wur; # endif #endif -- 2.49.0