diff options
| author |   Christoph Hellwig <hch@lst.de> | 2017-05-08 23:27:10 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2017-05-15 17:42:18 +0200 |
| commit | 1c5876ddbdb401f814ef717394826e7dfb6704d4 (patch) | |
| tree | 225ae8fa49b447a2c7ace97f861031c7230ff76f /net/sunrpc/clnt.c | |
| parent | lockd: fix some weird indentation (diff) | |
| download | linux-dev-1c5876ddbdb401f814ef717394826e7dfb6704d4.tar.xz linux-dev-1c5876ddbdb401f814ef717394826e7dfb6704d4.zip | |
sunrpc: move p_count out of struct rpc_procinfo
p_count is the only writeable memeber of struct rpc_procinfo, which is
a good candidate to be const-ified as it contains function pointers.
This patch moves it into out out struct rpc_procinfo, and into a
separate writable array that is pointed to by struct rpc_version and
indexed by p_statidx.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'net/sunrpc/clnt.c')
| -rw-r--r-- | net/sunrpc/clnt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 964d5c4a1b60..f2d1f971247b 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1517,14 +1517,16 @@ static void call_start(struct rpc_task *task) { struct rpc_clnt *clnt = task->tk_client; + int idx = task->tk_msg.rpc_proc->p_statidx; dprintk("RPC: %5u call_start %s%d proc %s (%s)\n", task->tk_pid, clnt->cl_program->name, clnt->cl_vers, rpc_proc_name(task), (RPC_IS_ASYNC(task) ? "async" : "sync")); - /* Increment call count */ - task->tk_msg.rpc_proc->p_count++; + /* Increment call count (version might not be valid for ping) */ + if (clnt->cl_program->version[clnt->cl_vers]) + clnt->cl_program->version[clnt->cl_vers]->counts[idx]++; clnt->cl_stats->rpccnt++; task->tk_action = call_reserve; } |