diff options
Diffstat (limited to 'net/sunrpc/stats.c')
-rw-r--r-- | net/sunrpc/stats.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c index 32adddd7fb78..ffae7c2245b1 100644 --- a/net/sunrpc/stats.c +++ b/net/sunrpc/stats.c | |||
@@ -235,13 +235,12 @@ static void _print_rpc_iostats(struct seq_file *seq, struct rpc_iostats *stats, | |||
235 | ktime_to_ms(stats->om_execute)); | 235 | ktime_to_ms(stats->om_execute)); |
236 | } | 236 | } |
237 | 237 | ||
238 | void rpc_print_iostats(struct seq_file *seq, struct rpc_clnt *clnt) | 238 | void rpc_clnt_show_stats(struct seq_file *seq, struct rpc_clnt *clnt) |
239 | { | 239 | { |
240 | struct rpc_iostats *stats = clnt->cl_metrics; | ||
241 | struct rpc_xprt *xprt; | 240 | struct rpc_xprt *xprt; |
242 | unsigned int op, maxproc = clnt->cl_maxproc; | 241 | unsigned int op, maxproc = clnt->cl_maxproc; |
243 | 242 | ||
244 | if (!stats) | 243 | if (!clnt->cl_metrics) |
245 | return; | 244 | return; |
246 | 245 | ||
247 | seq_printf(seq, "\tRPC iostats version: %s ", RPC_IOSTATS_VERS); | 246 | seq_printf(seq, "\tRPC iostats version: %s ", RPC_IOSTATS_VERS); |
@@ -256,10 +255,18 @@ void rpc_print_iostats(struct seq_file *seq, struct rpc_clnt *clnt) | |||
256 | 255 | ||
257 | seq_printf(seq, "\tper-op statistics\n"); | 256 | seq_printf(seq, "\tper-op statistics\n"); |
258 | for (op = 0; op < maxproc; op++) { | 257 | for (op = 0; op < maxproc; op++) { |
259 | _print_rpc_iostats(seq, &stats[op], op, clnt->cl_procinfo); | 258 | struct rpc_iostats stats = {}; |
259 | struct rpc_clnt *next = clnt; | ||
260 | do { | ||
261 | _add_rpc_iostats(&stats, &next->cl_metrics[op]); | ||
262 | if (next == next->cl_parent) | ||
263 | break; | ||
264 | next = next->cl_parent; | ||
265 | } while (next); | ||
266 | _print_rpc_iostats(seq, &stats, op, clnt->cl_procinfo); | ||
260 | } | 267 | } |
261 | } | 268 | } |
262 | EXPORT_SYMBOL_GPL(rpc_print_iostats); | 269 | EXPORT_SYMBOL_GPL(rpc_clnt_show_stats); |
263 | 270 | ||
264 | /* | 271 | /* |
265 | * Register/unregister RPC proc files | 272 | * Register/unregister RPC proc files |