Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f594791 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Handle other occurrences of NFS4ERR_CONN_NOT_BOUND_TO_SESSION 



Let nfs4_schedule_session_recovery() handle the details of choosing
between resetting the session, and other session related recovery.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 7c5d7256

fs/nfs/nfs4_fs.h

+2 −2
Original line number Diff line number Diff line
@@ -313,9 +313,9 @@ struct rpc_cred *nfs4_get_renew_cred_locked(struct nfs_client *clp); 
#if defined(CONFIG_NFS_V4_1)

struct rpc_cred *nfs4_get_machine_cred_locked(struct nfs_client *clp);

struct rpc_cred *nfs4_get_exchange_id_cred(struct nfs_client *clp);

extern void nfs4_schedule_session_recovery(struct nfs4_session *);

extern void nfs4_schedule_session_recovery(struct nfs4_session *, int);

#else

static inline void nfs4_schedule_session_recovery(struct nfs4_session *session)

static inline void nfs4_schedule_session_recovery(struct nfs4_session *session, int err)

{

}

#endif /* CONFIG_NFS_V4_1 */

fs/nfs/nfs4filelayout.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int filelayout_async_handle_error(struct rpc_task *task, 
		dprintk("%s ERROR %d, Reset session. Exchangeid "

			"flags 0x%x\n", __func__, task->tk_status,

			clp->cl_exchange_flags);

		nfs4_schedule_session_recovery(clp->cl_session);

		nfs4_schedule_session_recovery(clp->cl_session, task->tk_status);

		break;

	case -NFS4ERR_DELAY:

	case -NFS4ERR_GRACE:

fs/nfs/nfs4proc.c

+4 −4
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc 
		case -NFS4ERR_SEQ_MISORDERED:

			dprintk("%s ERROR: %d Reset session\n", __func__,

				errorcode);

			nfs4_schedule_session_recovery(clp->cl_session);

			nfs4_schedule_session_recovery(clp->cl_session, errorcode);

			exception->retry = 1;

			break;

#endif /* defined(CONFIG_NFS_V4_1) */
@@ -1330,7 +1330,7 @@ int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state 
			case -NFS4ERR_BAD_HIGH_SLOT:

			case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:

			case -NFS4ERR_DEADSESSION:

				nfs4_schedule_session_recovery(server->nfs_client->cl_session);

				nfs4_schedule_session_recovery(server->nfs_client->cl_session, err);

				goto out;

			case -NFS4ERR_STALE_CLIENTID:

			case -NFS4ERR_STALE_STATEID:
@@ -3906,7 +3906,7 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, 
		case -NFS4ERR_SEQ_MISORDERED:

			dprintk("%s ERROR %d, Reset session\n", __func__,

				task->tk_status);

			nfs4_schedule_session_recovery(clp->cl_session);

			nfs4_schedule_session_recovery(clp->cl_session, task->tk_status);

			task->tk_status = 0;

			return -EAGAIN;

#endif /* CONFIG_NFS_V4_1 */
@@ -4847,7 +4847,7 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) 
			case -NFS4ERR_BAD_HIGH_SLOT:

			case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:

			case -NFS4ERR_DEADSESSION:

				nfs4_schedule_session_recovery(server->nfs_client->cl_session);

				nfs4_schedule_session_recovery(server->nfs_client->cl_session, err);

				goto out;

			case -ERESTARTSYS:

				/*

fs/nfs/nfs4state.c

+8 −2
Original line number Diff line number Diff line
@@ -1635,11 +1635,17 @@ static int nfs4_reclaim_lease(struct nfs_client *clp) 
}



#ifdef CONFIG_NFS_V4_1

void nfs4_schedule_session_recovery(struct nfs4_session *session)

void nfs4_schedule_session_recovery(struct nfs4_session *session, int err)

{

	struct nfs_client *clp = session->clp;



	switch (err) {

	default:

		set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state);

		break;

	case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:

		set_bit(NFS4CLNT_BIND_CONN_TO_SESSION, &clp->cl_state);

	}

	nfs4_schedule_lease_recovery(clp);

}

EXPORT_SYMBOL_GPL(nfs4_schedule_session_recovery);