Skip to content

L
linux
Commit c44fe705 authored by Trond Myklebust's avatar Trond Myklebust
Browse files
Options

SUNRPC: Clean up tk_pid allocation and make it lockless 

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 4bef61ff
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 7 deletions
net/sunrpc/sched.c
View file @ c44fe705
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#ifdef RPC_DEBUG #ifdef RPC_DEBUG
#define RPCDBG_FACILITY RPCDBG_SCHED #define RPCDBG_FACILITY RPCDBG_SCHED
#define RPC_TASK_MAGIC_ID 0xf00baa #define RPC_TASK_MAGIC_ID 0xf00baa
static int rpc_task_id;
#endif #endif
/* /*
...@@ -268,17 +267,26 @@ static int rpc_wait_bit_interruptible(void *word) ...@@ -268,17 +267,26 @@ static int rpc_wait_bit_interruptible(void *word)
return 0; return 0;
} }
#ifdef RPC_DEBUG
static void rpc_task_set_debuginfo(struct rpc_task *task)
{
static atomic_t rpc_pid;
task->tk_magic = RPC_TASK_MAGIC_ID;
task->tk_pid = atomic_inc_return(&rpc_pid);
}
#else
static inline void rpc_task_set_debuginfo(struct rpc_task *task)
{
}
#endif
static void rpc_set_active(struct rpc_task *task) static void rpc_set_active(struct rpc_task *task)
{ {
struct rpc_clnt *clnt; struct rpc_clnt *clnt;
if (test_and_set_bit(RPC_TASK_ACTIVE, &task->tk_runstate) != 0) if (test_and_set_bit(RPC_TASK_ACTIVE, &task->tk_runstate) != 0)
return; return;
#ifdef RPC_DEBUG rpc_task_set_debuginfo(task);
task->tk_magic = RPC_TASK_MAGIC_ID;
spin_lock(&rpc_sched_lock);
task->tk_pid = rpc_task_id++;
spin_unlock(&rpc_sched_lock);
#endif
/* Add to global list of all tasks */ /* Add to global list of all tasks */
clnt = task->tk_client; clnt = task->tk_client;
if (clnt != NULL) { if (clnt != NULL) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7