Merge branch 'bh-remove'

diff --cc net/sunrpc/sched.c
Simple merge

diff --cc net/sunrpc/xprt.c
index ab6b4c729ca55d9ec105246e148d4626d87eb0b8,8d41fcf25650ef3a66fc9d421c8442c8b465dba8..c4d138202abb672a02855784a2abceaef2ee030d
--- 1/net/sunrpc/xprt.c
--- 2/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);