diff options
author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2018-09-03 23:39:27 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2018-09-30 15:35:15 -0400 |
commit | c544577daddb618c7dd5fa7fb98d6a41782f020e (patch) | |
tree | b3cfe2edc09c301ed6dfb4591e9d896c4965891f /net/sunrpc/svc_xprt.c | |
parent | 36bd7de949f41d586ef7794169af75462b67acbc (diff) |
SUNRPC: Clean up transport write space handling
Treat socket write space handling in the same way we now treat transport
congestion: by denying the XPRT_LOCK until the transport signals that it
has free buffer space.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'net/sunrpc/svc_xprt.c')
-rw-r--r-- | net/sunrpc/svc_xprt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index 5185efb9027b..87533fbb96cf 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c | |||
@@ -171,7 +171,6 @@ void svc_xprt_init(struct net *net, struct svc_xprt_class *xcl, | |||
171 | mutex_init(&xprt->xpt_mutex); | 171 | mutex_init(&xprt->xpt_mutex); |
172 | spin_lock_init(&xprt->xpt_lock); | 172 | spin_lock_init(&xprt->xpt_lock); |
173 | set_bit(XPT_BUSY, &xprt->xpt_flags); | 173 | set_bit(XPT_BUSY, &xprt->xpt_flags); |
174 | rpc_init_wait_queue(&xprt->xpt_bc_pending, "xpt_bc_pending"); | ||
175 | xprt->xpt_net = get_net(net); | 174 | xprt->xpt_net = get_net(net); |
176 | strcpy(xprt->xpt_remotebuf, "uninitialized"); | 175 | strcpy(xprt->xpt_remotebuf, "uninitialized"); |
177 | } | 176 | } |
@@ -895,7 +894,6 @@ int svc_send(struct svc_rqst *rqstp) | |||
895 | else | 894 | else |
896 | len = xprt->xpt_ops->xpo_sendto(rqstp); | 895 | len = xprt->xpt_ops->xpo_sendto(rqstp); |
897 | mutex_unlock(&xprt->xpt_mutex); | 896 | mutex_unlock(&xprt->xpt_mutex); |
898 | rpc_wake_up(&xprt->xpt_bc_pending); | ||
899 | trace_svc_send(rqstp, len); | 897 | trace_svc_send(rqstp, len); |
900 | svc_xprt_release(rqstp); | 898 | svc_xprt_release(rqstp); |
901 | 899 | ||