From nobody Wed Sep 03 02:05:40 2025 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 4cGmD42zkxz669Mh; Wed, 03 Sep 2025 02:05:40 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGmD42KBGz3g0X; Wed, 03 Sep 2025 02:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756865140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CPoqmJ62ZCBHPaXPT/S7YcKJRkghiK6/2LeqsPFIfoE=; b=K6eTUCGMKDdt8kGNazWtsXPx/4aC/gcOum25CS11nyUVIinzKWJOESlgrpSIgHcHY5podR 2/PhyBO3EAqldMk8SpV0s0rnQXVOe3c1qF019jygCYOmtYxgigp0TX2U2+j4NSq11NpX7g HVrNeAhVFFe8yS1ekHaw8PoxpqUioG0kp7NmjE2K7ID8ucVhcUjKiyuXBsqJyiZE0OEK3e Rm0y4ZQAIfMyw3sUd2p4qXExDWbO+WCbm4uveZSe/iIL8Po2hmetyXdSCyZ6Lq9o5aveFb wilkP3hOgVMk5Is6Nb8Jd/qadh0c6PlygDn4Uyp16OZWmY4cX6jyCwRF2pEbkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756865140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CPoqmJ62ZCBHPaXPT/S7YcKJRkghiK6/2LeqsPFIfoE=; b=Un7N3JJ4QHoN4PczCUHBBJ7OyBcB3QDxgvpjGcQuVAf9T0qVD9iMfbyoeuunu3czMIS35t 7sraklvMCV6Bnf8J0mEG1CObxOdeT1RTn7IEv+9UAfOvZC8zErdCdP/pktv0rThe2QkqIY wNEHv0HmnciosNyr7BD2zHWzeG2F+gygVjZVpkl5febllkEwLEO/wYyBQ2NqhFMBddF7AN bwHYw/PhqDfdtk21cnYGp8vcbIS638hbO/uRtiEcJWRrDvVuOmnmmFkJbmbw7NUeKCxFku pSfO7RF2j/og5yk0VQbywE3jSXXfmKkKMY4Ibmfp60eXCq4cEyCaSIdznb0vEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756865140; a=rsa-sha256; cv=none; b=ak4QYFIvbI6gteFd4YP+5yll43Ia0kfdDsu8PzWwxFrY7IITJ3hRqPNBrPxBaEeD7oOdhu 0WBrJWwhrctVFSUcqG3bQGs6J4j6VFaC/X1jKVn2CoKae4faxwWf0iRWmRd2Upp6YKU20O +LwWAEyT0hCsgfEYra+Qn6qVEf4ajdCpdra4pr75hZb6Esc0WidmDEKUSrJqQomWxZr5x+ McK3KcRU6R72HO4jVf6Ch2dOYZ5faulFOKSMVqkf1ND6HE/J5clSbRQBOXR4eYQ/NuluZQ 1jscPCItQp59hCVQJGj03bCIOVcg4cT5u7mTkVNsU+jBLdZ5mgEs1bHcOF6YPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cGmD41VXLz1Bsn; Wed, 03 Sep 2025 02:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58325ew3089619; Wed, 3 Sep 2025 02:05:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58325euh089616; Wed, 3 Sep 2025 02:05:40 GMT (envelope-from git) Date: Wed, 3 Sep 2025 02:05:40 GMT Message-Id: <202509030205.58325euh089616@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d10640804e74 - stable/14 - nfs client: switch nfs_advlock() to use exclusive vnode lock 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d10640804e74b84ba06102a1a399a34117f4cf41 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d10640804e74b84ba06102a1a399a34117f4cf41 commit d10640804e74b84ba06102a1a399a34117f4cf41 Author: Konstantin Belousov AuthorDate: 2025-08-27 16:57:06 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-03 02:05:20 +0000 nfs client: switch nfs_advlock() to use exclusive vnode lock (cherry picked from commit fe53e046cd9ce9c95a118ac0374e94336f16a37f) --- sys/fs/nfsclient/nfs_clvnops.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 7f751d81d5e5..013ab2445a83 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3253,7 +3253,7 @@ nfs_advlock(struct vop_advlock_args *ap) u_quad_t size; struct nfsmount *nmp; - error = NFSVOPLOCK(vp, LK_SHARED); + error = NFSVOPLOCK(vp, LK_EXCLUSIVE); if (error != 0) return (EBADF); nmp = VFSTONFS(vp->v_mount); @@ -3290,11 +3290,6 @@ nfs_advlock(struct vop_advlock_args *ap) cred = p->p_ucred; else cred = td->td_ucred; - NFSVOPLOCK(vp, LK_UPGRADE | LK_RETRY); - if (VN_IS_DOOMED(vp)) { - error = EBADF; - goto out; - } /* * If this is unlocking a write locked region, flush and