SUNRPC: Eliminate the now-redundant rpc_start_wakeup() (f5fb7b06) · Commits · 戴 / test

include/linux/sunrpc/sched.h

+1 −11

Original line number	Diff line number	Diff line
		@@ -142,8 +142,7 @@ struct rpc_task_setup {

		#define RPC_TASK_RUNNING 0
		#define RPC_TASK_QUEUED 1
		#define RPC_TASK_WAKEUP 2
		#define RPC_TASK_ACTIVE 3
		#define RPC_TASK_ACTIVE 2

		#define RPC_IS_RUNNING(t) test_bit(RPC_TASK_RUNNING, &(t)->tk_runstate)
		#define rpc_set_running(t) set_bit(RPC_TASK_RUNNING, &(t)->tk_runstate)
		@@ -165,15 +164,6 @@ struct rpc_task_setup {
		smp_mb__after_clear_bit(); \
		} while (0)

		#define rpc_start_wakeup(t) \
		(test_and_set_bit(RPC_TASK_WAKEUP, &(t)->tk_runstate) == 0)
		#define rpc_finish_wakeup(t) \
		do { \
		smp_mb__before_clear_bit(); \
		clear_bit(RPC_TASK_WAKEUP, &(t)->tk_runstate); \
		smp_mb__after_clear_bit(); \
		} while (0)

		#define RPC_IS_ACTIVATED(t) test_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate)

		/*

+2 −6

Original line number	Diff line number	Diff line
		@@ -384,12 +384,8 @@ static void __rpc_do_wake_up_task(struct rpc_wait_queue *queue, struct rpc_task
		*/
		static void rpc_wake_up_task_queue_locked(struct rpc_wait_queue queue, struct rpc_task task)
		{
		if (!RPC_IS_QUEUED(task) \|\| task->tk_waitqueue != queue)
		return;
		if (rpc_start_wakeup(task)) {
		if (RPC_IS_QUEUED(task) && task->tk_waitqueue == queue)
		__rpc_do_wake_up_task(queue, task);
		rpc_finish_wakeup(task);
		}
		}

		/*