Merge tag 'char-misc-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[karo-tx-linux.git] / net / sunrpc / stats.c

diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index caeb01ad2b5aeb4ecc54cf9a15fe0a495b45c6d8..1e671333c3d5b5a61be412860a4cfe85db7b66eb 100644 (file)
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -55,8 +55,7 @@ static int rpc_proc_show(struct seq_file *seq, void *v) {
                seq_printf(seq, "proc%u %u",
                                        vers->number, vers->nrprocs);
                for (j = 0; j < vers->nrprocs; j++)
-                       seq_printf(seq, " %u",
-                                       vers->procs[j].p_count);
+                       seq_printf(seq, " %u", vers->counts[j]);
                seq_putc(seq, '\n');
        }
        return 0;
@@ -78,9 +77,9 @@ static const struct file_operations rpc_proc_fops = {
 /*
  * Get RPC server stats
  */
-void svc_seq_show(struct seq_file *seq, const struct svc_stat *statp) {
+void svc_seq_show(struct seq_file *seq, const struct svc_stat *statp)
+{
        const struct svc_program *prog = statp->program;
-       const struct svc_procedure *proc;
        const struct svc_version *vers;
        unsigned int i, j;
 
@@ -99,11 +98,12 @@ void svc_seq_show(struct seq_file *seq, const struct svc_stat *statp) {
                        statp->rpcbadclnt);
 
        for (i = 0; i < prog->pg_nvers; i++) {
-               if (!(vers = prog->pg_vers[i]) || !(proc = vers->vs_proc))
+               vers = prog->pg_vers[i];
+               if (!vers)
                        continue;
                seq_printf(seq, "proc%d %u", i, vers->vs_nproc);
-               for (j = 0; j < vers->vs_nproc; j++, proc++)
-                       seq_printf(seq, " %u", proc->pc_count);
+               for (j = 0; j < vers->vs_nproc; j++)
+                       seq_printf(seq, " %u", vers->vs_count[j]);
                seq_putc(seq, '\n');
        }
 }
@@ -192,7 +192,7 @@ void rpc_count_iostats(const struct rpc_task *task, struct rpc_iostats *stats)
 EXPORT_SYMBOL_GPL(rpc_count_iostats);
 
 static void _print_name(struct seq_file *seq, unsigned int op,
-                       struct rpc_procinfo *procs)
+                       const struct rpc_procinfo *procs)
 {
        if (procs[op].p_name)
                seq_printf(seq, "\t%12s: ", procs[op].p_name);