| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Trond Myklebust <trond.myklebust@primarydata.com> |
| Date: Thu, 4 May 2017 13:44:04 -0400 |
| Subject: NFSv4.1: RECLAIM_COMPLETE must handle NFS4ERR_CONN_NOT_BOUND_TO_SESSION |
| |
| From: Trond Myklebust <trond.myklebust@primarydata.com> |
| |
| |
| [ Upstream commit 0048fdd06614a4ea088f9fcad11511956b795698 ] |
| |
| If the server returns NFS4ERR_CONN_NOT_BOUND_TO_SESSION because we |
| are trunking, then RECLAIM_COMPLETE must handle that by calling |
| nfs4_schedule_session_recovery() and then retrying. |
| |
| Reported-by: Chuck Lever <chuck.lever@oracle.com> |
| Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> |
| Tested-by: Chuck Lever <chuck.lever@oracle.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| fs/nfs/nfs4proc.c | 7 ++++++- |
| fs/nfs/nfs4state.c | 10 +++++++--- |
| 2 files changed, 13 insertions(+), 4 deletions(-) |
| |
| --- a/fs/nfs/nfs4proc.c |
| +++ b/fs/nfs/nfs4proc.c |
| @@ -8173,6 +8173,12 @@ static int nfs41_reclaim_complete_handle |
| /* fall through */ |
| case -NFS4ERR_RETRY_UNCACHED_REP: |
| return -EAGAIN; |
| + case -NFS4ERR_BADSESSION: |
| + case -NFS4ERR_DEADSESSION: |
| + case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: |
| + nfs4_schedule_session_recovery(clp->cl_session, |
| + task->tk_status); |
| + break; |
| default: |
| nfs4_schedule_lease_recovery(clp); |
| } |
| @@ -8251,7 +8257,6 @@ static int nfs41_proc_reclaim_complete(s |
| if (status == 0) |
| status = task->tk_status; |
| rpc_put_task(task); |
| - return 0; |
| out: |
| dprintk("<-- %s status=%d\n", __func__, status); |
| return status; |
| --- a/fs/nfs/nfs4state.c |
| +++ b/fs/nfs/nfs4state.c |
| @@ -1637,13 +1637,14 @@ static void nfs4_state_start_reclaim_reb |
| nfs4_state_mark_reclaim_helper(clp, nfs4_state_mark_reclaim_reboot); |
| } |
| |
| -static void nfs4_reclaim_complete(struct nfs_client *clp, |
| +static int nfs4_reclaim_complete(struct nfs_client *clp, |
| const struct nfs4_state_recovery_ops *ops, |
| struct rpc_cred *cred) |
| { |
| /* Notify the server we're done reclaiming our state */ |
| if (ops->reclaim_complete) |
| - (void)ops->reclaim_complete(clp, cred); |
| + return ops->reclaim_complete(clp, cred); |
| + return 0; |
| } |
| |
| static void nfs4_clear_reclaim_server(struct nfs_server *server) |
| @@ -1690,13 +1691,16 @@ static void nfs4_state_end_reclaim_reboo |
| { |
| const struct nfs4_state_recovery_ops *ops; |
| struct rpc_cred *cred; |
| + int err; |
| |
| if (!nfs4_state_clear_reclaim_reboot(clp)) |
| return; |
| ops = clp->cl_mvops->reboot_recovery_ops; |
| cred = nfs4_get_clid_cred(clp); |
| - nfs4_reclaim_complete(clp, ops, cred); |
| + err = nfs4_reclaim_complete(clp, ops, cred); |
| put_rpccred(cred); |
| + if (err == -NFS4ERR_CONN_NOT_BOUND_TO_SESSION) |
| + set_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state); |
| } |
| |
| static void nfs4_state_start_reclaim_nograce(struct nfs_client *clp) |