From nobody Wed May 06 05:38:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9PL26QXdz6dMCy for ; Wed, 06 May 2026 05:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9PL25fgfz49ty for ; Wed, 06 May 2026 05:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XySEvOfWDcnn8ddWeABhLcGx37hUwcBfeR413efWFCg=; b=dzQMx93d8KDMln1yIEK7j8V9KyYSUMh0QGSoaEvNDLKFfeqDZjAn7fKFMKdvv26UEIzO5j pL/K+iwDN9RZo526lt53tS5Ts1ixDtyyxh7BsBL3ylqkMZfbHRyxK7xgbyo34WdDsrf1Ga NTFGUYXH6Q64XcFiDAqnZ6MaADcTRWBNAFtuDPu52qPm1+PyxAu//PbW/+lPThXzuQWMXV xoiSTjuVM7a1EH21ZYf9N6UkEnWJ5MZjXSZuSZ1v+YNcqNrKWbhRv+l/3HXGIJ9Vuyyjsg tfcpnDQlWj26ckfmatNI3ZIO1mazW3Cn+Yas8htHDE2UiBuHN49AtTPpeCxpFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778045882; a=rsa-sha256; cv=none; b=k2eCFNbAkzbRl/IkYFV75wzPsSJGo0Owo7fgA32bLE6vjvU4GPZxNcQ4itG9vxG1gAFPf7 JqGJ/9PZ8tfzbA6+VolB3wjnPgMeyiIupeXl3Sl4RA+9feLWeDL/f0LgzFFpzE8tzyl26a AFhY8d9vV+Gt6AEobRscZdVrHwofRWMzbb0WE6fRl8wcA88f5z04aC7EIDy3G3Q+73pRV2 eTD/Uckexbzr53MZb0xRQVktHV/5jbl6ezHo1axFevsccut2VsVwvcx3T8j2ZaFBBaxInN PZqmUl2FmGqzqZsNdZ/79YOSJybWBBksOPoTFttbCj7G+mwRMTTrZCy/hzvIdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XySEvOfWDcnn8ddWeABhLcGx37hUwcBfeR413efWFCg=; b=boIqU7FHRhlqIzLRtGqDa1yhlyHGyYX8ngImvEnvh3Zf1aYNcvFCFRxOQbQoorB0iNX14v e8EnqssadYswzuEX0CVSKMpvAso7ZzyQpxNDPM477iT7EfyegzkFk98kk8jKhI5+Bcoo0Z 9fX7UHRUTPRUuNuEZcUxd7nH5H+gWvZ66sWMMNx6JvX/ptl2I1n+olT/5m+3ZnXjGbB0zf 8Da/M5nXyIDZvCCNZ+Zdhbhkuu6axDIwTvz5iBTENK00AnuuGYYMn2txyLqAoDXflJUucn FBiTCM4HcxSltrvTN2yoKaQZWcynVh6C91KRyejgNu3U5dZgrgSwvSTMast9wA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9PL25Bz9z9X0 for ; Wed, 06 May 2026 05:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 391e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 05:38:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christian Ullrich From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 651b82e64ef4 - stable/15 - lockf: Avoid spinning when operating on an fd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 651b82e64ef4f753d8f4c1793f359de39744526c Auto-Submitted: auto-generated Date: Wed, 06 May 2026 05:38:02 +0000 Message-Id: <69fad3ba.391e3.7d05cecd@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=651b82e64ef4f753d8f4c1793f359de39744526c commit 651b82e64ef4f753d8f4c1793f359de39744526c Author: Christian Ullrich AuthorDate: 2026-05-03 15:35:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-06 05:37:26 +0000 lockf: Avoid spinning when operating on an fd When operating on a file descriptor, acquire_lock() would ignore the flags argument and always operate in non-blocking mode, resulting in unnecessary busy-looping. PR: 294832 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56722 (cherry picked from commit d90513ea85693da0ca5955173609f4e81e38ae16) --- usr.bin/lockf/lockf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index 16bae36a21e0..076d28b7ddd5 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -320,10 +320,14 @@ acquire_lock(union lock_subject *subj, int flags, int silent) int fd; if (fdlock) { + int lflags = LOCK_EX; + assert(subj->subj_fd >= 0 && subj->subj_fd <= INT_MAX); fd = (int)subj->subj_fd; - if (flock(fd, LOCK_EX | LOCK_NB) == -1) { + if ((flags & O_NONBLOCK) == O_NONBLOCK) + lflags |= LOCK_NB; + if (flock(fd, lflags) == -1) { if (errno == EAGAIN || errno == EINTR) return (-1); err(EX_CANTCREAT, "cannot lock fd %d", fd);