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

Commit 5d63360d authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Clean up session draining 



Coalesce nfs4_check_drain_bc_complete and nfs4_check_drain_fc_complete
into a single function that can be called when the slot table is known
to be empty, then change nfs4_callback_free_slot() and nfs4_free_slot()
to use it.

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

fs/nfs/callback.h

+0 −2
Original line number Diff line number Diff line
@@ -167,8 +167,6 @@ extern __be32 nfs4_callback_layoutrecall( 
	struct cb_layoutrecallargs *args,

	void *dummy, struct cb_process_state *cps);



extern void nfs4_check_drain_bc_complete(struct nfs4_session *ses);



struct cb_devicenotifyitem {

	uint32_t		cbd_notify_type;

	uint32_t		cbd_layout_type;

fs/nfs/callback_xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ static void nfs4_callback_free_slot(struct nfs4_session *session) 
	 * A single slot, so highest used slotid is either 0 or -1

	 */

	tbl->highest_used_slotid = NFS4_NO_SLOT;

	nfs4_check_drain_bc_complete(session);

	nfs4_session_drain_complete(session, tbl);

	spin_unlock(&tbl->slot_tbl_lock);

}

fs/nfs/nfs4_fs.h

+8 −0
Original line number Diff line number Diff line
@@ -335,6 +335,14 @@ int nfs41_discover_server_trunking(struct nfs_client *clp, 
			struct nfs_client **, struct rpc_cred *);

extern void nfs4_schedule_session_recovery(struct nfs4_session *, int);

extern void nfs41_server_notify_target_slotid_update(struct nfs_client *clp);



extern void nfs4_session_drain_complete(struct nfs4_session *session,

		struct nfs4_slot_table *tbl);



static inline bool nfs4_session_draining(struct nfs4_session *session)

{

	return !!test_bit(NFS4_SESSION_DRAINING, &session->session_state);

}

#else

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

{

fs/nfs/nfs4proc.c

+6 −32
Original line number Diff line number Diff line
@@ -445,8 +445,10 @@ nfs4_free_slot(struct nfs4_slot_table *tbl, struct nfs4_slot *slot) 
		u32 new_max = find_last_bit(tbl->used_slots, slotid);

		if (new_max < slotid)

			tbl->highest_used_slotid = new_max;

		else

		else {

			tbl->highest_used_slotid = NFS4_NO_SLOT;

			nfs4_session_drain_complete(tbl->session, tbl);

		}

	}

	dprintk("%s: slotid %u highest_used_slotid %d\n", __func__,

		slotid, tbl->highest_used_slotid);
@@ -458,36 +460,6 @@ bool nfs4_set_task_privileged(struct rpc_task *task, void *dummy) 
	return true;

}



/*

 * Signal state manager thread if session fore channel is drained

 */

static void nfs4_check_drain_fc_complete(struct nfs4_session *ses)

{

	if (!test_bit(NFS4_SESSION_DRAINING, &ses->session_state)) {

		rpc_wake_up_first(&ses->fc_slot_table.slot_tbl_waitq,

				nfs4_set_task_privileged, NULL);

		return;

	}



	if (ses->fc_slot_table.highest_used_slotid != NFS4_NO_SLOT)

		return;



	dprintk("%s COMPLETE: Session Fore Channel Drained\n", __func__);

	complete(&ses->fc_slot_table.complete);

}



/*

 * Signal state manager thread if session back channel is drained

 */

void nfs4_check_drain_bc_complete(struct nfs4_session *ses)

{

	if (!test_bit(NFS4_SESSION_DRAINING, &ses->session_state) ||

	    ses->bc_slot_table.highest_used_slotid != NFS4_NO_SLOT)

		return;

	dprintk("%s COMPLETE: Session Back Channel Drained\n", __func__);

	complete(&ses->bc_slot_table.complete);

}



static void nfs41_sequence_free_slot(struct nfs4_sequence_res *res)

{

	struct nfs4_session *session;
@@ -504,7 +476,9 @@ static void nfs41_sequence_free_slot(struct nfs4_sequence_res *res) 


	spin_lock(&tbl->slot_tbl_lock);

	nfs4_free_slot(tbl, res->sr_slot);

	nfs4_check_drain_fc_complete(session);

	if (!nfs4_session_draining(session))

		rpc_wake_up_first(&tbl->slot_tbl_waitq,

				nfs4_set_task_privileged, NULL);

	spin_unlock(&tbl->slot_tbl_lock);

	res->sr_slot = NULL;

}

fs/nfs/nfs4state.c

+10 −0
Original line number Diff line number Diff line
@@ -271,6 +271,16 @@ static void nfs4_end_drain_session(struct nfs_client *clp) 
	}

}



/*

 * Signal state manager thread if session fore channel is drained

 */

void nfs4_session_drain_complete(struct nfs4_session *session,

		struct nfs4_slot_table *tbl)

{

	if (nfs4_session_draining(session))

		complete(&tbl->complete);

}



static int nfs4_wait_on_slot_tbl(struct nfs4_slot_table *tbl)

{

	spin_lock(&tbl->slot_tbl_lock);