[pnfs] [PATCH] [SQUASHME] nfs41: unify nfs4_reboot_recovery_ops assignment in reclaimer

[Benny Halevy]

Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfs/nfs4state.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index fd30409..81f2c02 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1000,20 +1000,20 @@ restart_loop:
 				goto out;
 			case -NFS4ERR_STALE_CLIENTID:
 			case -NFS4ERR_LEASE_MOVED:
-				ops = nfs4_reboot_recovery_ops[0];
+				break;
+			default:
+				goto establish_clid;
 			}
 		case 1:
-			switch (status) {
-			case 0:
+			if (!status)
 				goto out;
-			default:
-				ops = nfs4_reboot_recovery_ops[1];
-			}
 		}
+		ops = nfs4_reboot_recovery_ops[clp->cl_minorversion];
 	} else {
 		/* "reboot" to ensure we clear all state on the server */
 		clp->cl_boot_time = CURRENT_TIME;
 	}
+establish_clid:
 	/* We're going to have to re-establish a clientid */
 	nfs4_state_mark_reclaim(clp);
 	status = -ENOENT;
-- 
1.5.6.2