Commit 32ce62c0 authored by Jeff Layton's avatar Jeff Layton Committed by Chuck Lever
Browse files

nfsd: move cb_need_restart flag into cb_flags 



Since there is now a cb_flags word, use a new NFSD4_CALLBACK_REQUEUE
flag in that instead of a separate boolean.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 49bdbdb1

fs/nfsd/nfs4callback.c

+4 −6
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ static void nfsd4_requeue_cb(struct rpc_task *task, struct nfsd4_callback *cb) 
	if (!test_bit(NFSD4_CLIENT_CB_KILL, &clp->cl_flags)) {

		trace_nfsd_cb_restart(clp, cb);

		task->tk_status = 0;

		cb->cb_need_restart = true;

		set_bit(NFSD4_CALLBACK_REQUEUE, &cb->cb_flags);

	}

}
@@ -1479,7 +1479,7 @@ static void nfsd4_cb_release(void *calldata) 


	trace_nfsd_cb_rpc_release(cb->cb_clp);



	if (cb->cb_need_restart)

	if (test_bit(NFSD4_CALLBACK_REQUEUE, &cb->cb_flags))

		nfsd4_queue_cb(cb);

	else

		nfsd41_destroy_cb(cb);
@@ -1618,12 +1618,11 @@ nfsd4_run_cb_work(struct work_struct *work) 
		return;

	}



	if (cb->cb_need_restart) {

		cb->cb_need_restart = false;

	} else {

	if (!test_and_clear_bit(NFSD4_CALLBACK_REQUEUE, &cb->cb_flags)) {

		if (cb->cb_ops && cb->cb_ops->prepare)

			cb->cb_ops->prepare(cb);

	}



	cb->cb_msg.rpc_cred = clp->cl_cb_cred;

	flags = clp->cl_minorversion ? RPC_TASK_NOCONNECT : RPC_TASK_SOFTCONN;

	rpc_call_async(clnt, &cb->cb_msg, RPC_TASK_SOFT | flags,
@@ -1641,7 +1640,6 @@ void nfsd4_init_cb(struct nfsd4_callback *cb, struct nfs4_client *clp, 
	cb->cb_ops = ops;

	INIT_WORK(&cb->cb_work, nfsd4_run_cb_work);

	cb->cb_status = 0;

	cb->cb_need_restart = false;

	cb->cb_held_slot = -1;

}

fs/nfsd/state.h

+1 −1
Original line number Diff line number Diff line
@@ -69,13 +69,13 @@ struct nfsd4_callback { 
	struct rpc_message cb_msg;

#define NFSD4_CALLBACK_RUNNING		(0)

#define NFSD4_CALLBACK_WAKE		(1)

#define NFSD4_CALLBACK_REQUEUE		(2)

	unsigned long cb_flags;

	const struct nfsd4_callback_ops *cb_ops;

	struct work_struct cb_work;

	int cb_seq_status;

	int cb_status;

	int cb_held_slot;

	bool cb_need_restart;

};



struct nfsd4_callback_ops {

fs/nfsd/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -1616,7 +1616,7 @@ DECLARE_EVENT_CLASS(nfsd_cb_lifetime_class, 
		__entry->cl_id = clp->cl_clientid.cl_id;

		__entry->cb = cb;

		__entry->opcode = cb->cb_ops ? cb->cb_ops->opcode : _CB_NULL;

		__entry->need_restart = cb->cb_need_restart;

		__entry->need_restart = test_bit(NFSD4_CALLBACK_REQUEUE, &cb->cb_flags);

		__assign_sockaddr(addr, &clp->cl_cb_conn.cb_addr,

				  clp->cl_cb_conn.cb_addrlen)

	),