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

Commit 0629e370 authored by Alexandros Batsakis's avatar Alexandros Batsakis Committed by Trond Myklebust
Browse files

nfs41: check SEQUENCE status flag 



the server can indicate a number of error conditions by setting the
appropriate bits in the SEQUENCE operation. The client re-establishes
state with the server when it receives one of those, with the action
depending on the specific case.

Signed-off-by: default avatarAlexandros Batsakis <batsakis@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 2449ea2e

fs/nfs/nfs4_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ extern void nfs4_state_set_mode_locked(struct nfs4_state *, fmode_t); 
extern void nfs4_schedule_state_recovery(struct nfs_client *);

extern void nfs4_schedule_state_manager(struct nfs_client *);

extern int nfs4_state_mark_reclaim_nograce(struct nfs_client *clp, struct nfs4_state *state);

extern void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags);

extern void nfs4_put_lock_state(struct nfs4_lock_state *lsp);

extern int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl);

extern void nfs4_copy_stateid(nfs4_stateid *, struct nfs4_state *, fl_owner_t);

fs/nfs/nfs4proc.c

+2 −0
Original line number Diff line number Diff line
@@ -405,6 +405,8 @@ static void nfs41_sequence_done(struct nfs_client *clp, 
		if (time_before(clp->cl_last_renewal, timestamp))

			clp->cl_last_renewal = timestamp;

		spin_unlock(&clp->cl_lock);

		/* Check sequence flags */

		nfs41_handle_sequence_flag_errors(clp, res->sr_status_flags);

		return;

	}

out:

fs/nfs/nfs4state.c

+22 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,28 @@ static int nfs4_reclaim_lease(struct nfs_client *clp) 
}



#ifdef CONFIG_NFS_V4_1

void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags)

{

	if (!flags)

		return;

	else if (flags & SEQ4_STATUS_RESTART_RECLAIM_NEEDED) {

		set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);

		nfs4_state_start_reclaim_reboot(clp);

		nfs4_schedule_state_recovery(clp);

	} else if (flags & (SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED |

			    SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED |

			    SEQ4_STATUS_ADMIN_STATE_REVOKED |

			    SEQ4_STATUS_RECALLABLE_STATE_REVOKED |

			    SEQ4_STATUS_LEASE_MOVED)) {

		set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);

		nfs4_state_start_reclaim_nograce(clp);

		nfs4_schedule_state_recovery(clp);

	} else if (flags & (SEQ4_STATUS_CB_PATH_DOWN |

			    SEQ4_STATUS_BACKCHANNEL_FAULT |

			    SEQ4_STATUS_CB_PATH_DOWN_SESSION))

		nfs_expire_all_delegations(clp);

}



static void nfs4_session_recovery_handle_error(struct nfs_client *clp, int err)

{

	switch (err) {

fs/nfs/nfs4xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -4614,8 +4614,8 @@ static int decode_sequence(struct xdr_stream *xdr, 
	dummy = be32_to_cpup(p++);

	/* target highest slot id - currently not processed */

	dummy = be32_to_cpup(p++);

	/* result flags - currently not processed */

	dummy = be32_to_cpup(p);

	/* result flags */

	res->sr_status_flags = be32_to_cpup(p);

	status = 0;

out_err:

	res->sr_status = status;

include/linux/nfs4.h

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ 
#define SEQ4_STATUS_RECALLABLE_STATE_REVOKED	0x00000040

#define SEQ4_STATUS_LEASE_MOVED			0x00000080

#define SEQ4_STATUS_RESTART_RECLAIM_NEEDED	0x00000100

#define SEQ4_STATUS_CB_PATH_DOWN_SESSION	0x00000200

#define SEQ4_STATUS_BACKCHANNEL_FAULT		0x00000400



#define NFS4_MAX_UINT64	(~(u64)0)