lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SUNRPC: Eliminate the now-redundant rpc_start_wakeup()

Browse Source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust
2008-02-25 21:40:50 -08:00
parent eb276c0e10
commit f5fb7b06e4
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/linux/sunrpc/sched.h
View File

@@ -142,8 +142,7 @@ struct rpc_task_setup {
#define RPC_TASK_RUNNING 0 #define RPC_TASK_RUNNING 0
#define RPC_TASK_QUEUED 1 #define RPC_TASK_QUEUED 1
#define RPC_TASK_WAKEUP 2 #define RPC_TASK_ACTIVE 2
#define RPC_TASK_ACTIVE 3
#define RPC_IS_RUNNING(t) test_bit(RPC_TASK_RUNNING, &(t)->tk_runstate) #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) #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(); \ smp_mb__after_clear_bit(); \
} while (0) } 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) #define RPC_IS_ACTIVATED(t) test_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate)
/* /*

8
net/sunrpc/sched.c
View File

@@ -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) 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) if (RPC_IS_QUEUED(task) && task->tk_waitqueue == queue)
return; __rpc_do_wake_up_task(queue, task);
if (rpc_start_wakeup(task)) {
__rpc_do_wake_up_task(queue, task);
rpc_finish_wakeup(task);
}
} }
/* /*