From: Trond Myklebust <trond.myklebust@hammerspace.com>
Date: Tue, 11 Jun 2019 20:53:33 +0000 (-0400)
Subject: Merge branch 'multipath_tcp'
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c98ebe2937404d8e6e028ac9cadcf870a6faccc2;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'multipath_tcp'
---

c98ebe2937404d8e6e028ac9cadcf870a6faccc2
diff --cc net/sunrpc/stats.c
index 48ea776364f8,d26df6074bca..7c74197c2ecf
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@@ -236,13 -233,19 +236,20 @@@ static void _print_rpc_iostats(struct s
  		   stats->om_bytes_recv,
  		   ktime_to_ms(stats->om_queue),
  		   ktime_to_ms(stats->om_rtt),
 -		   ktime_to_ms(stats->om_execute));
 +		   ktime_to_ms(stats->om_execute),
 +		   stats->om_error_status);
  }
  
+ static int do_print_stats(struct rpc_clnt *clnt, struct rpc_xprt *xprt, void *seqv)
+ {
+ 	struct seq_file *seq = seqv;
+ 
+ 	xprt->ops->print_stats(xprt, seq);
+ 	return 0;
+ }
+ 
  void rpc_clnt_show_stats(struct seq_file *seq, struct rpc_clnt *clnt)
  {
- 	struct rpc_xprt *xprt;
  	unsigned int op, maxproc = clnt->cl_maxproc;
  
  	if (!clnt->cl_metrics)