From nobody Wed May 06 05:38:09 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 4g9PL94Xhmz6dM02 for ; Wed, 06 May 2026 05:38:09 +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 4g9PL91Vd4z3C1S for ; Wed, 06 May 2026 05:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045889; 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=w7V/S2BVm8C2CoN/c7k0ralizwrHyKuVsl5oL1ywGbI=; b=wEpvUmaBiAHUyyG+sUHBArCffcDMwdJIkjQKf6w90m5tR7CELI21hjRJpqa4+eWqKKAnyC ERCMsX62RrH7utNJb8D9hXE1h7xJhGG84rHhWTbh/+nYdZws3Ln55ET8ZAF1Fv8lTlRNr6 8WqfmBrKAJbrOY/5si7CGVYsS6ZkY+rQUL31KjLhEZbaWOBIOvWcPxSwDVGupCRt4wbg7r HHuR6sqHw7IO+ZDggUE/geAkqGfymWBXbLPePvOgGD6AQuCjCqfYXFXaK18J/CEjTu3h+T V3y6NpQyzdLuAzmPv2sjdZ8SrjXMFfTDsggyKeYwQA+q3X14cFCoBtRXcdiNCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778045889; a=rsa-sha256; cv=none; b=PmS+PxHwej0Z4BtZ//GFtH277c80YG1taXLF9Sp/gK42MiwAWG/eQ7y44kkd4idZsA9GVA YeWIfANBWQAORg+jMpCPZGB////omYqQkeRdAF5roJ5kTKW51DlPIryN8Gm6QRE5R0c/Nq C3r4UmO+AQPbXQlrqJgoOebhPGzVRqjkdMVX9/Qex8K/RL0yYJjZJ08skQtZ8CV7mSXxbG l0Db91EOH8wC0QEow/ST0tfFpeIwKmGlCn8qSdLDgA/IGdy9P17xP1inHUKxyH9tQXE6gM 9gbZTxNYpm7NTys98ji7oN1vSbg0G07fNsXEiZ/kezTBgTi3ba8r9/JXwGWmHg== 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=1778045889; 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=w7V/S2BVm8C2CoN/c7k0ralizwrHyKuVsl5oL1ywGbI=; b=vPwlVZEZprAb0+sh9Te384UVdJlRMXYEKqGl6l6rPm/8qAvxy22dif/UFKhTA4Sr0EP+aM jRUzRbxhgUfX7/Fmn9GRSRcPqzvgj7KKyh6WyOsFC/ZtsMBoRitNWTvcDpfwiHmkGAonVf lXCDfuzYbFxy06UUO97R/c9dBOPH0kgMsyrKyjZz8RHr7atHpe2c7Ui7XdzC26nnLWGTMR Bxjq9j4QzuNI0ioMkTFnjQR2q+KwKXGDmhLifyoJ7rugiu9ICwiSE6NrIEpSl+Gu7tN4ff AiWqRy0jbFFUvHfXZSiECvYbHi1g/s+4InAIlW7rQAC479lbmQwp6bCC8ukzTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9PL90z36z9G9 for ; Wed, 06 May 2026 05:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 386bd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 05:38:09 +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: 4a6c4f0265ac - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 4a6c4f0265ac7234cf31a3c4494e3354caf629d3 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 05:38:09 +0000 Message-Id: <69fad3c1.386bd.12ff8fd0@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4a6c4f0265ac7234cf31a3c4494e3354caf629d3 commit 4a6c4f0265ac7234cf31a3c4494e3354caf629d3 Author: Christian Ullrich AuthorDate: 2026-05-03 15:35:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-06 05:37:39 +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 dd02bf2a5417..cd4a1623fb71 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -267,10 +267,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);