From nobody Sat Oct 08 23:30:34 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 4MlLyL2XRDz4fK5R; Sat, 8 Oct 2022 23:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MlLyL266gz3ZCX; Sat, 8 Oct 2022 23:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665271834; 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=EqQebfAfNgbSgxbRi38HCyVxdth4RTVuhD+VIxMtRU8=; b=CQnyAdHmKw56vfC87E1xsfRdxhETxUoR1MyrtBvzAoPIJpEdeGPfZt8AE+/EAAAj1/sxqf XEd9NXiDC80GQvuv2W854tmfjx1/nAkYZ0kBBt9RJ8sDefGGtp2TTk4g203TRK5ulfnL7m l8oPugV4gDLj7xeKjUUOagr46eBrULU9HTOxeamjrvEWW0ca4DSq1qKIYZigSmqV0QFEDX mnG4drYjY2TMiZoz4EGS/rUxcbsmX1mtQzvvz1yGexzq4sOt0z5kHcMuy8hmmJfM8CwGvN SbXX7eF9QM3F2O6Siki+W5BZP3lcbdd1kSiwvRjhaV7cLK2mRNpxOL7ucLRmLA== 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 4MlLyL17Bxz15YX; Sat, 8 Oct 2022 23:30:34 +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 298NUYxc042862; Sat, 8 Oct 2022 23:30:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 298NUYhX042861; Sat, 8 Oct 2022 23:30:34 GMT (envelope-from git) Date: Sat, 8 Oct 2022 23:30:34 GMT Message-Id: <202210082330.298NUYhX042861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: e2ba9f0f6010 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: e2ba9f0f6010231a108ea528ed0e3864ebeb5cbe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665271834; 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=EqQebfAfNgbSgxbRi38HCyVxdth4RTVuhD+VIxMtRU8=; b=iWMqFWifD+0BWVdX1XgeoEyduYhOuP91hCPmq+hn0PDmXAv+0yEvnI1ZFNHhtWNm0ldPqO aNvzsc5wE5WxGD7E6N8KK4hfNfJo2rBZn1wYCTsLLCrYipT8xTpy98L63M9JvrnlLr5a8i TFkzFQRxpsNLyeabUTc3Vx264w9kA/QHZ0/NobKvMgoC77XhIhQh7c/dSqhJ91dIDEMFNK wYaDN0tqOmKj5J5SbXyzBESIQvBiwijkFdFzjQoTYdCRfFdMOWT2Ge+wrfa0rwyd2l0/Kp unTLibeyuqyYdspulLNVAz4wycAQCWABZTfMZRfzYRS6t5QcOXVDeB1KF0FAzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665271834; a=rsa-sha256; cv=none; b=WPrkXvm1t9/BFILbH3G6b5BNC898C6GUGQDLNKVmiWHgwhMpons83LssylLRSYBctNL056 VE7cS1s7yhyajouVN9u0EXmBM0LZfQCmWR+kVKDpPfIbj4t80C6KtIgC4nGSdWomBHMQYA HmjlqPlMCz5t+Al4gPVdyjWhtst7ltWZiToVa4yrL6KO84n0eEzCJuWDR86JdKQ9Z2GvG/ zGMHKcSr59/+3nv5e0ZVdkFz5yxIFmoSQURkw3c/1La70dPo1gyjbMsmMiqHeSbARZKoiA TjEwo39X0p4ITl3kEzDhBisSunj7IYi92e3U8ZN5kCAWKBoTt9a1kTVqlcGoZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=e2ba9f0f6010231a108ea528ed0e3864ebeb5cbe commit e2ba9f0f6010231a108ea528ed0e3864ebeb5cbe Author: Rick Macklem AuthorDate: 2022-10-01 23:30:07 +0000 Commit: Rick Macklem CommitDate: 2022-10-08 23:29:22 +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(). (cherry picked from commit a82308abab86740e9bc37499bd2a13568764d7a0) --- 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 569327b14e41..155028a81716 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3425,11 +3425,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);