From nobody Sat Oct 01 23:31:14 2022 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 4Mg3JL1sRPz4V7Vm; Sat, 1 Oct 2022 23:31:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mg3JL1RDTz3Xvh; Sat, 1 Oct 2022 23:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664667074; 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=Rqb4ifCkVnuYvQFV7yoklreXGaICzQlxALJe7vbByGA=; b=bo0qGkFHtc3gVkkASLuPIYzX0QYhy4TgnH+ZWASYw4E9sVMCDfcGtBanhRnZVhxrUmLWtM 5JNS6m6AuH7ycDG1PSpkzUWHpUm49pBUu3KRauMoOt0Y08iqeGZPNHepaHDrw9aEiO917H 9/MmFVlfWXIHqQYGje84hQdgHroagObMRPhHyrWAixdZQw7uZel8CDBDXcjMlbMUlXMbZO fGoLkrHONHZRHZT6p4iNlXAl2m38bnR9PshujRIW5ayVSOKNbScLsR13H1IjsKRow4c4rw EwSQmUhCs7X2IV63D+TtVkJjJ0WND0rJGIUM8koBl7tZHHSMW+CazpBiO8RtwQ== 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 4Mg3JL0Tw7zh1T; Sat, 1 Oct 2022 23:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 291NVE6e092574; Sat, 1 Oct 2022 23:31:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 291NVETE092573; Sat, 1 Oct 2022 23:31:14 GMT (envelope-from git) Date: Sat, 1 Oct 2022 23:31:14 GMT Message-Id: <202210012331.291NVETE092573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: a82308abab86 - main - nfs_clvnops.c: Fix access to v_mount when vnode unlocked 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a82308abab86740e9bc37499bd2a13568764d7a0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664667074; 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=Rqb4ifCkVnuYvQFV7yoklreXGaICzQlxALJe7vbByGA=; b=B1WrUzDUPnLW4JUCY8K1/eEoemingR0idixgnFiySuUucBjJvYMYhhUTYc8ZHM/9uQb/3I MJJWXzm6fReUT9RolGh3C8K8dbX/3dmHR1oWTfnpGWg102VHUBE0riVxiYPdHZu7yyl4Em Y8Jl2AlSDL7pgNOcmTFSEGVsiJchTMhH9Px3fWIKQEMkccTlxoyZlkf5rt4ZCJz8i4Zdy+ rlue/gsmHJ3bwoJUYaDBACxq9F4LBxsC1Fwf8M+bDHa7xXhVDa21UXKRBeeRb2n6S4jWoB A/5IFZiDfQZGtXWSQGpP1xE99+ZJ1zHI7JRDvNw07YgfMPSdt8l1RqPKSm2N/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664667074; a=rsa-sha256; cv=none; b=hoESABswTW3lxlF/KlQxe2MYo8Vmvmfhl3+8OU2TomxHCfG6Bw3L1Rzz0ceqS4K652tnEH 9+uKGO2sZBDMvrJlrUippUhdfz3A2O/1SVwOnPw+HgDqvic72qatSJD5fdAq1PlHeDIVoB cxMcQmbDzsq0v2T/rn+mNUao083SJcTwiq5+WRW1ZCcf2OGZxhzNoR+GswjaUcSmu3qebZ uorDhQJ9537AbnlfDNpKmd2HtWCeiIj9vbz4dxjGSWUUYyKlB3k+Cp5KGfsdZnzopX+ORj 9c+d8q6Akd+shkzXnjKxUDbB2Kihbh2o3FkVBAdTNiPbnoxNCwpBlrRtdbjDrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=a82308abab86740e9bc37499bd2a13568764d7a0 commit a82308abab86740e9bc37499bd2a13568764d7a0 Author: Rick Macklem AuthorDate: 2022-10-01 23:30:07 +0000 Commit: Rick Macklem CommitDate: 2022-10-01 23:30:07 +0000 nfs_clvnops.c: Fix access to v_mount when vnode unlocked Commit ab17854f974b fixed access to v_mount when the vnode is unlocked for nfs_copy_file_range(). This patch does the same for nfs_advlockasync(). MFC after: 1 week --- sys/fs/nfsclient/nfs_clvnops.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 686b69eaa637..eeffce65a7db 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3417,11 +3417,13 @@ nfs_advlockasync(struct vop_advlockasync_args *ap) u_quad_t size; int error; - if (NFS_ISV4(vp)) - return (EOPNOTSUPP); error = NFSVOPLOCK(vp, LK_SHARED); if (error) return (error); + if (NFS_ISV4(vp)) { + NFSVOPUNLOCK(vp); + return (EOPNOTSUPP); + } if ((VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NOLOCKD) != 0) { size = VTONFS(vp)->n_size; NFSVOPUNLOCK(vp);