From nobody Sun May 3 15:35:34 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 4g7pkt44wgz6W2BR for ; Sun, 03 May 2026 15:35:34 +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 4g7pkt1HLHz3Gq5 for ; Sun, 03 May 2026 15:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777822534; 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=0lgMsdLjNKdtBOfCr/kJs4UoiWPefHHc1KrXocBqWCo=; b=qGof70BdlVwT40gyQ+bMC/VntyFAl4RErrHeB/gB9ieFRmcJ8ICxPnqMSeTmiHGSfWRm+T PSFETuRNKOKtMNjcEQmi1y4IXvQxAyWClVbRVQyyE3or+XlWGtPHTQIqnczb7FUn31twC6 8d5yc83M/M70yqo/zEM7zYDVqwSk4nUAGunvlibfgfrXN5BMRqx4vbTiL6kyi+TqGDRV55 npB8mEinYbA7gOdK7oln3BxldBIvWaKXesVuasAXeBzxBQ1JPL5tP24BX4yqyedLoI5SOi VB53B8dYcRgZ+3ng7CJCa3pPRnl45RO7y6ZJIRRfgtkoG7X2R5xXK0zGX8Fglg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777822534; a=rsa-sha256; cv=none; b=afePlb0zDhRSlgBY9LN4gPyXYbqzYqKODtvPrmErGEFiMGmJYx/kJv90x6MD/mkxE6kuK2 VUsW6l0SZQilBtjtWA8ZZtMUwNd3phWSWEtvDxeSp1qiVFuQ7iqztRcm549coXGS6tJ3EW YkKwyctT63qvMmyz4Tuowl+Ddx+HQUp3z22EdP4m213F7YFdUbMnp82hdcsl/xo2oFvfrQ gWidmVDi7PEVj52gop4inaGbCjdtyaeR4tiVA4uEqzK6BwI9upuurdzJc5y3ovdWLz0bxb nQPoIuvp1yQghJ9AqMeZwkov0PgCcgwo2a8shoYfTnDMZtvyc+m37vIIAZtwyQ== 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=1777822534; 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=0lgMsdLjNKdtBOfCr/kJs4UoiWPefHHc1KrXocBqWCo=; b=WDNDVIMG27NhZocuoD990QOBi4UX0c2gGTGR3rLwX2/FU4RodCHKZR//bbKqiCBv0v2if0 +6hSMUpH3Xr/U9cElEv1WKfn4Syfr78+nwY4bmDOQe/y4vcnhE+vrO4z9R26b9SqvZJt3I wsr4EEFiIFLNQZ2mxB/gLDf3LCVUaVK30TJjpbuKXD19jyWBfWUdO2OJCuxLl3hYisQoPG 2jFLJqNBxpMrmQhxX0aGxD53wZG0R2V+4LBq6wIxwK6+/xWsbY+xz4iPGzeiXj5PpL8SGY /akClXwwOAJv/S/pbl4DsYoBpfROrYuFprV4PyQx3TqzgU4DZK+R6pd9Dq5z/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g7pkt0HDyzfWm for ; Sun, 03 May 2026 15:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dcb7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 03 May 2026 15:35:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Christian Ullrich From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d90513ea8569 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d90513ea85693da0ca5955173609f4e81e38ae16 Auto-Submitted: auto-generated Date: Sun, 03 May 2026 15:35:34 +0000 Message-Id: <69f76b46.1dcb7.14503f26@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d90513ea85693da0ca5955173609f4e81e38ae16 commit d90513ea85693da0ca5955173609f4e81e38ae16 Author: Christian Ullrich AuthorDate: 2026-05-03 15:35:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-03 15:35:10 +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 --- 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);