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

Commit 0d7bb719 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: set sequence flag when backchannel is down 



Implement the SEQ4_STATUS_CB_PATH_DOWN flag.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 77a3569d

fs/nfsd/nfs4state.c

+5 −1
Original line number Diff line number Diff line
@@ -1800,8 +1800,12 @@ nfsd4_sequence(struct svc_rqst *rqstp, 
out:

	/* Hold a session reference until done processing the compound. */

	if (cstate->session) {

		struct nfs4_client *clp = session->se_client;



		nfsd4_get_session(cstate->session);

		atomic_inc(&session->se_client->cl_refcount);

		atomic_inc(&clp->cl_refcount);

		if (clp->cl_cb_state == NFSD4_CB_DOWN)

			seq->status_flags |= SEQ4_STATUS_CB_PATH_DOWN;

	}

	kfree(conn);

	spin_unlock(&client_lock);

fs/nfsd/nfs4xdr.c

+2 −6
Original line number Diff line number Diff line
@@ -3137,13 +3137,9 @@ nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr, 
	WRITE32(seq->seqid);

	WRITE32(seq->slotid);

	WRITE32(seq->maxslots);

	/*

	 * FIXME: for now:

	 *   target_maxslots = maxslots

	 *   status_flags = 0

	 */

	/* For now: target_maxslots = maxslots */

	WRITE32(seq->maxslots);

	WRITE32(0);

	WRITE32(seq->status_flags);



	ADJUST_ARGS();

	resp->cstate.datap = p; /* DRC cache data pointer */

fs/nfsd/xdr4.h

+1 −1
Original line number Diff line number Diff line
@@ -378,8 +378,8 @@ struct nfsd4_sequence { 
	u32			cachethis;		/* request */

#if 0

	u32			target_maxslots;	/* response */

	u32			status_flags;		/* response */

#endif /* not yet */

	u32			status_flags;		/* response */

};



struct nfsd4_destroy_session {