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

Merge branch 'bh-remove'
---

41adafa02eeb622ffc1f085c9a862a6554ed667e
diff --cc net/sunrpc/xprt.c
index ab6b4c729ca5,8d41fcf25650..c4d138202abb
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@@ -1765,8 -1760,12 +1760,8 @@@ void xprt_release(struct rpc_task *task
  	}
  
  	xprt = req->rq_xprt;
 -	if (task->tk_ops->rpc_count_stats != NULL)
 -		task->tk_ops->rpc_count_stats(task, task->tk_calldata);
 -	else if (task->tk_client)
 -		rpc_count_iostats(task, task->tk_client->cl_metrics);
  	xprt_request_dequeue_all(task, req);
- 	spin_lock_bh(&xprt->transport_lock);
+ 	spin_lock(&xprt->transport_lock);
  	xprt->ops->release_xprt(xprt, task);
  	if (xprt->ops->release_request)
  		xprt->ops->release_request(task);