From owner-dev-commits-src-all@freebsd.org Thu Jun 3 01:16:30 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1EAFD64F7C2; Thu, 3 Jun 2021 01:16:30 +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 4FwSf60PRXz3Lch; Thu, 3 Jun 2021 01:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E5C7521182; Thu, 3 Jun 2021 01:16:29 +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 1531GTca047378; Thu, 3 Jun 2021 01:16:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1531GTMR047377; Thu, 3 Jun 2021 01:16:29 GMT (envelope-from git) Date: Thu, 3 Jun 2021 01:16:29 GMT Message-Id: <202106030116.1531GTMR047377@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: 7f527ae46b06 - stable/12 - nfscl: Revert commit 5a8b2c5a46dffa3828ad16abee36ac4676f741bf 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/12 X-Git-Reftype: branch X-Git-Commit: 7f527ae46b061c056fd395f46daf0481e2a292b8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2021 01:16:30 -0000 The branch stable/12 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=7f527ae46b061c056fd395f46daf0481e2a292b8 commit 7f527ae46b061c056fd395f46daf0481e2a292b8 Author: Rick Macklem AuthorDate: 2021-06-03 01:13:21 +0000 Commit: Rick Macklem CommitDate: 2021-06-03 01:13:21 +0000 nfscl: Revert commit 5a8b2c5a46dffa3828ad16abee36ac4676f741bf This is a direct commit, since the MFC mis-merged. --- sys/fs/nfsclient/nfs_clstate.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index e1b9d37b3a3e..e705af31185b 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -1977,7 +1977,6 @@ nfscl_recover(struct nfsclclient *clp, struct ucred *cred, NFSPROC_T *p) u_int32_t delegtype = NFSV4OPEN_DELEGATEWRITE, mode; int i, igotlock = 0, error, trycnt, firstlock; struct nfscllayout *lyp, *nlyp; - bool recovered_one; /* * First, lock the client structure, so everyone else will @@ -2051,7 +2050,6 @@ nfscl_recover(struct nfsclclient *clp, struct ucred *cred, NFSPROC_T *p) * Now traverse the state lists, doing Open and Lock Reclaims. */ tcred = newnfs_getcred(); - recovered_one = false; owp = LIST_FIRST(&clp->nfsc_owner); while (owp != NULL) { nowp = LIST_NEXT(owp, nfsow_list); @@ -2085,7 +2083,6 @@ nfscl_recover(struct nfsclclient *clp, struct ucred *cred, NFSPROC_T *p) op->nfso_mode, op, NULL, 0, &ndp, 1, delegtype, tcred, p); if (!error) { - recovered_one = true; /* Handle any replied delegation */ if (ndp != NULL && ((ndp->nfsdl_flags & NFSCLDL_WRITE) || NFSMNT_RDONLY(nmp->nm_mountp))) { @@ -2144,21 +2141,6 @@ nfscl_recover(struct nfsclclient *clp, struct ucred *cred, NFSPROC_T *p) nfscl_freelockowner(lp, 0); lp = nlp; } - } else if (error == NFSERR_NOGRACE && !recovered_one && - NFSHASNFSV4N(nmp)) { - /* - * For NFSv4.1/4.2, the NFSERR_EXPIRED case will - * actually end up here, since the client will do - * a recovery for NFSERR_BADSESSION, but will get - * an NFSERR_NOGRACE reply for the first "reclaim" - * attempt. - * So, call nfscl_expireclient() to recover the - * opens as best we can and then do a reclaim - * complete and return. - */ - nfsrpc_reclaimcomplete(nmp, cred, p); - nfscl_expireclient(clp, nmp, tcred, p); - goto out; } } if (error != 0 && error != NFSERR_BADSESSION) @@ -2245,23 +2227,6 @@ nfscl_recover(struct nfsclclient *clp, struct ucred *cred, NFSPROC_T *p) if (error) { if (nop != NULL) free(nop, M_NFSCLOPEN); - if (error == NFSERR_NOGRACE && !recovered_one && - NFSHASNFSV4N(nmp)) { - /* - * For NFSv4.1/4.2, the NFSERR_EXPIRED case will - * actually end up here, since the client will do - * a recovery for NFSERR_BADSESSION, but will get - * an NFSERR_NOGRACE reply for the first "reclaim" - * attempt. - * So, call nfscl_expireclient() to recover the - * opens as best we can and then do a reclaim - * complete and return. - */ - nfsrpc_reclaimcomplete(nmp, cred, p); - nfscl_expireclient(clp, nmp, tcred, p); - free(nowp, M_NFSCLOWNER); - goto out; - } /* * Couldn't reclaim it, so throw the state * away. Ouch!! @@ -2269,7 +2234,6 @@ nfscl_recover(struct nfsclclient *clp, struct ucred *cred, NFSPROC_T *p) nfscl_cleandeleg(dp); nfscl_freedeleg(&clp->nfsc_deleg, dp, true); } else { - recovered_one = true; LIST_INSERT_HEAD(&extra_open, nop, nfso_list); } }