Attachment 235179 Details for Bug 260011 – Do not mark recovery for NFSERR_BADSESSION

[patch] Do not mark recovery for NFSERR_BADSESSION

slot.patch (text/plain), 1.48 KB, created by Rick Macklem on 2022-07-11 01:08:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rick Macklem

Created: 2022-07-11 01:08:37 UTC

Size: 1.48 KB

patch

obsolete

>--- sys/fs/nfsclient/nfs_clstate.c.slot	2022-05-23 13:38:55.729677000 -0700
>+++ sys/fs/nfsclient/nfs_clstate.c	2022-05-25 13:39:56.328211000 -0700
>@@ -2765,8 +2765,7 @@ nfscl_renewthread(struct nfsclclient *clp, NFSPROC_T *
> 			error = nfsrpc_renew(clp, NULL, cred, p);
> 			if (error == NFSERR_CBPATHDOWN)
> 			    cbpathdown = 1;
>-			else if (error == NFSERR_STALECLIENTID ||
>-			    error == NFSERR_BADSESSION) {
>+			else if (error == NFSERR_STALECLIENTID) {
> 			    NFSLOCKCLSTATE();
> 			    clp->nfsc_flags |= NFSCLFLAGS_RECOVER;
> 			    NFSUNLOCKCLSTATE();
>--- sys/fs/nfsclient/nfs_clrpcops.c.slot	2022-05-23 13:40:27.480417000 -0700
>+++ sys/fs/nfsclient/nfs_clrpcops.c	2022-05-25 13:11:47.062719000 -0700
>@@ -1062,8 +1062,12 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclcli
> 			 * in-progress RPCs.
> 			 */
> 			tsep = NULL;
>-			if (TAILQ_FIRST(&nmp->nm_sess) != NULL)
>+			if (TAILQ_FIRST(&nmp->nm_sess) != NULL) {
> 				tsep = NFSMNT_MDSSESSION(nmp);
>+				if (tsep->nfsess_defunct == 0)
>+					printf("nfsrpc_setclient: "
>+					    "nfsess_defunct not set\n");
>+			}
> 			TAILQ_INSERT_HEAD(&nmp->nm_sess, dsp,
> 			    nfsclds_list);
> 			/*
>@@ -8355,7 +8359,7 @@ nfsrpc_createlayout(vnode_t dvp, char *name, int namel
> 	}
> 	if (nd->nd_repstat != 0 && error == 0)
> 		error = nd->nd_repstat;
>-	if (error == NFSERR_STALECLIENTID || error == NFSERR_BADSESSION)
>+	if (error == NFSERR_STALECLIENTID)
> 		nfscl_initiate_recovery(owp->nfsow_clp);
> nfsmout:
> 	NFSCL_DEBUG(4, "eo nfsrpc_createlayout err=%d\n", error);

Actions: View | Diff

Attachments on bug 260011: 234050 | 234051 | 234052 | 234053 | 234101 | 234129 | 234164 | 234241 | 234243 | 235179 | 235180 | 235200 | 236118 | 236170