Attachment 178894 Details for Bug 216086 – Don't free openowner+opens when a recovery attempt fails

[patch] Don't free openowner+opens when a recovery attempt fails

recoverkeepopens.patch (text/plain), 1.13 KB, created by Rick Macklem on 2017-01-14 22:44:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rick Macklem

Created: 2017-01-14 22:44:16 UTC

Size: 1.13 KB

patch

obsolete

>--- fs/nfsclient/nfs_clstate.c.sav3	2017-01-13 21:24:38.711825000 -0500
>+++ fs/nfsclient/nfs_clstate.c	2017-01-14 08:57:57.623055000 -0500
>@@ -1933,10 +1933,10 @@ nfscl_recover(struct nfsclclient *clp, s
> 	     error == NFSERR_BADSESSION ||
> 	     error == NFSERR_STALEDONTRECOVER) && --trycnt > 0);
> 	if (error) {
>-		nfscl_cleanclient(clp);
>+printf("recov setcl failed=%d\n", error);
> 		NFSLOCKCLSTATE();
>-		clp->nfsc_flags &= ~(NFSCLFLAGS_HASCLIENTID |
>-		    NFSCLFLAGS_RECOVER | NFSCLFLAGS_RECVRINPROG);
>+		clp->nfsc_flags &= ~(NFSCLFLAGS_RECOVER |
>+		    NFSCLFLAGS_RECVRINPROG);
> 		wakeup(&clp->nfsc_flags);
> 		nfsv4_unlock(&clp->nfsc_lock, 0);
> 		NFSUNLOCKCLSTATE();
>@@ -2253,13 +2253,9 @@ nfscl_hasexpired(struct nfsclclient *clp
> 	     error == NFSERR_BADSESSION ||
> 	     error == NFSERR_STALEDONTRECOVER) && --trycnt > 0);
> 	if (error) {
>-		/*
>-		 * Clear out any state.
>-		 */
>-		nfscl_cleanclient(clp);
>+printf("expire setcl failed=%d\n", error);
> 		NFSLOCKCLSTATE();
>-		clp->nfsc_flags &= ~(NFSCLFLAGS_HASCLIENTID |
>-		    NFSCLFLAGS_RECOVER);
>+		clp->nfsc_flags &= ~NFSCLFLAGS_RECOVER;
> 	} else {
> 		/*
> 		 * Expire the state for the client.

Actions: View | Diff

Attachments on bug 216086: 178894