From nobody Wed May 6 16:30:35 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 4g9gpz1s5Bz6crwG for ; Wed, 06 May 2026 16:30:35 +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 4g9gpz0hygz3dCt for ; Wed, 06 May 2026 16:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778085035; 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=WIrnq2N7RjTCXMQmarQ/+gWEGZOZLlWz2RttMjtJQqI=; b=U4fNAuQmt04Im+uiQDy9S7s7kZVf8xjUjHylw5afUMFLhvpnzLhzvo4MPd+ms/6im/37oq 8iatbzu8xZHj/rOVwjL5+A/DlLsh4ONzdQmmGbDd9oZDHU+AlEtTffFZNIoaghyyN9yCQP sNKqp8dEid4DqcuDbowpihNas4GUbybWCRrf757Hz7HF6YDuTVqyKHwrb+qJGVqk7jCbo6 2clM4K7IDyrA6yvj4i9s2y6Ao5k6bNSFMe4AQvR+raNWFr05iNjqtSVc3+ZjsibZBAK+CR 5oV2ZlkdVxZRDd7kJAqfq1dU6+JqKxL50mkPY5RUlSBABk5noKFL1C/74L3ZDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778085035; a=rsa-sha256; cv=none; b=thNwHn37Y/8D+mr1cFaYi1LfStTMhmY3JnOpW6jR5nPnyBXIr7giyLcSCtc26QrAjkVp4M K4V/CGWasy1bBLSJs2NZvPaPnoM2/qSEuzy/FKRUMmsH0u+pg6mDIfN2HCNh98rf6Ik86N JR9DYD5ho0dC/+tPsgD/Gs3MgwIF+pEf4MoIvdaHE1cdpKw0dLqmjUsNQPmjVefxFwxOgP WJPNsmDyUkh6TjxYZT66Of88szamH6GVzN2A0RbwgS2fmW3pKkZ9rCuiuDtVmHLedqMtk3 x8IRV1dkrd/Y4DzK39jmrSQbGseC/oM+X2uurTMZWdaONLy3BBIXt1FC2r/VPQ== 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=1778085035; 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=WIrnq2N7RjTCXMQmarQ/+gWEGZOZLlWz2RttMjtJQqI=; b=mauvZXXD4+TEjBW3YmMb49/mm1CKIUH5gBnuzDyxXDWMzmmimJk/NaYK5bHEqwDHPdU7WM cj9XIGwnBVkyiZYTN9Gdltjxzoh9w2xAMkrgcC/D0E/2mE9DLw2GwCBMaxSghIQi9tSBTt KtXaaNhb1uKvaM5otYibCgBPtkDz5bYYazvKU5G279Z+6njSAYkMwjF/yNqk3I9DtKOa5+ JkNxki8q4mMrUDNC81WCIAgATAHuUieWL/iqH/aOds4JbT+2LPmWuKCb6TgHnSaltM6J1i wHo+Ndnd7T8hQL1a5/69KsiOh2Q6REbnSelLvU3hzzFUtSmhn6yFuWHe5hPiRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9gpz0DzdzmWy for ; Wed, 06 May 2026 16:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a80 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 16:30:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christian Ullrich From: Colin Percival Subject: git: d0f618e7ae95 - releng/15.1 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: d0f618e7ae955af283cb03a805e130e6c03d0d38 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 16:30:35 +0000 Message-Id: <69fb6cab.26a80.58688fe2@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d0f618e7ae955af283cb03a805e130e6c03d0d38 commit d0f618e7ae955af283cb03a805e130e6c03d0d38 Author: Christian Ullrich AuthorDate: 2026-05-03 15:35:10 +0000 Commit: Colin Percival CommitDate: 2026-05-06 16:30:18 +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. Approved by: re (cperciva) PR: 294832 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56722 (cherry picked from commit d90513ea85693da0ca5955173609f4e81e38ae16) (cherry picked from commit 651b82e64ef4f753d8f4c1793f359de39744526c) --- 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);