From nobody Thu Mar 17 14:49:00 2022 X-Original-To: dev-commits-src-main@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 100EF1A23345; Thu, 17 Mar 2022 14:49:01 +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 4KK9586yZRz3Mk7; Thu, 17 Mar 2022 14:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647528541; 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=RGsAHcit19wvPLblwf7j6yzf161EyBIGtTiBcDgfKrw=; b=awFzUk0Wc1Uz2fpQSyL4LDcmdlvSaMzHFCR4mLLCeFVpdqQzAQkPzJq8kEPyTBYf5bgh+s 7ssdE7+Gztz4BHc6j2XagrO6CHeANSzyDE8pfVvVZT245JIqHEy8wJoZu3wm6crpc0+K3S oH1X9jVvpGbAqxt0ZHtPEblNu1WIaUSm4nyAIiBL3qz2Xr0/vmMgL3o33SOIpfGQuAZ+5k orDQ+rlG/cXzZy5uQBB/thvZwNK5Wic+l3IatTI3nxk2h03NvWjlacX8JNVSjpSc4VX1m7 piBg/Xuw1HkosMfQqnESOdRbnZkAckdBsdF9Dc/0GVkUSFFzveANGPFDCofUgA== 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 CE8E4490D; Thu, 17 Mar 2022 14:49:00 +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 22HEn0RQ071575; Thu, 17 Mar 2022 14:49:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HEn0v5071574; Thu, 17 Mar 2022 14:49:00 GMT (envelope-from git) Date: Thu, 17 Mar 2022 14:49:00 GMT Message-Id: <202203171449.22HEn0v5071574@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: f37dc50d9f08 - main - nfscl: Do not do a Lookup+Open for pNFS mounts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f37dc50d9f082cb9ce427847aa7227b6d4d44465 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647528541; 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=RGsAHcit19wvPLblwf7j6yzf161EyBIGtTiBcDgfKrw=; b=lpC0s51m5gc3Mwq71MrNR89GVKOQz8In+/CQ4KnhrLLmZx08S9VoaqNLL3MhN8v5bIOFkz mcvKIErYp4QIReDEo0Z28SJIM7vceCzUfhRQpaC0rJd50UPGcK4jmW5d9m1kGcFqq2UoTy zoSeCVSe1+GVhIIMdrl/fl0y2UZevXg+407t9hlWFBohqwBuuf4IVpQ097Fl4yb2hM6VM+ cA/tPkN0+mIIk5mjstXMk/K/Xjepz3GGKK0e9B/XwrnyN/0siGCfytJBCa6eLozqCbgO9/ hGIk7fnUaVk9whby/2sO1PmyZPTo1nloGMu1xr7/UkLQxesBn34Z/DsE0bcuIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647528541; a=rsa-sha256; cv=none; b=jCOzu6dd9OZre52lvC3QURQybNYUEo59KA6G/MMmXaVLvLYOBy6+ZWx357AFXgmuUIoC77 fkOdz51hDtaqmdnGeExS+YexTeO8FGmIiXEbfyhvv5doZsWeUB2h2lfgRkk/BlZYfYj3hx EWmtaWFsNXpxb8Y5WAf8L3BJk/JlXMyt8jUUloblARgT23/BQNaLrQ5pYNVNk4XvHB/CAh YFKf3E0PX4mJR7goHj0bYvc8QDSON9q0eTtZiWJBZiVsSi/Pxz5dCJ/47jxMMNs6zgNha/ /0OKcDfSMmj53/IxHNgsMJOOTVl0kYGlBrMHjXr2PtXxdd5yTHj2lnrOQcB17Q== 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=f37dc50d9f082cb9ce427847aa7227b6d4d44465 commit f37dc50d9f082cb9ce427847aa7227b6d4d44465 Author: Rick Macklem AuthorDate: 2022-03-17 14:48:06 +0000 Commit: Rick Macklem CommitDate: 2022-03-17 14:48:06 +0000 nfscl: Do not do a Lookup+Open for pNFS mounts A NFSv4.1/4.2 pNFS mount needs to do a separate Open+LayoutGet RPC, so do not do a Lookup+Open RPC for these mounts. The Lookup+Open RPCs are still disabled, until further testing is done, so this patch has no effect at this time. --- sys/fs/nfsclient/nfs_clvnops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index ba2ba27b8fb6..528095078729 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1333,9 +1333,11 @@ nfs_lookup(struct vop_lookup_args *ap) * option, it is possible to do the Open operation in the same * compound as Lookup, so long as delegations are not being * issued. This saves doing a separate RPC for Open. + * For pnfs, do not do this, since the Open+LayoutGet will + * be needed as a separate RPC. */ NFSLOCKMNT(nmp); - if (NFSHASNFSV4N(nmp) && NFSHASONEOPENOWN(nmp) && + if (NFSHASNFSV4N(nmp) && NFSHASONEOPENOWN(nmp) && !NFSHASPNFS(nmp) && (nmp->nm_privflag & NFSMNTP_DELEGISSUED) == 0 && (!NFSMNT_RDONLY(mp) || (flags & OPENWRITE) == 0) && (flags & (ISLASTCN | ISOPEN)) == (ISLASTCN | ISOPEN)) {