Commit dfcf0380 authored by Trond Myklebust's avatar Trond Myklebust

SUNRPC: Fix up socket polling

Ensure that we do not exit the socket read callback without clearing
XPRT_SOCK_DATA_READY.
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent b76a5afd
...@@ -649,9 +649,9 @@ static void xs_stream_data_receive(struct sock_xprt *transport) ...@@ -649,9 +649,9 @@ static void xs_stream_data_receive(struct sock_xprt *transport)
ssize_t ret = 0; ssize_t ret = 0;
mutex_lock(&transport->recv_mutex); mutex_lock(&transport->recv_mutex);
clear_bit(XPRT_SOCK_DATA_READY, &transport->sock_state);
if (transport->sock == NULL) if (transport->sock == NULL)
goto out; goto out;
clear_bit(XPRT_SOCK_DATA_READY, &transport->sock_state);
for (;;) { for (;;) {
ret = xs_read_stream(transport, MSG_DONTWAIT); ret = xs_read_stream(transport, MSG_DONTWAIT);
if (ret < 0) if (ret < 0)
...@@ -1346,10 +1346,10 @@ static void xs_udp_data_receive(struct sock_xprt *transport) ...@@ -1346,10 +1346,10 @@ static void xs_udp_data_receive(struct sock_xprt *transport)
int err; int err;
mutex_lock(&transport->recv_mutex); mutex_lock(&transport->recv_mutex);
clear_bit(XPRT_SOCK_DATA_READY, &transport->sock_state);
sk = transport->inet; sk = transport->inet;
if (sk == NULL) if (sk == NULL)
goto out; goto out;
clear_bit(XPRT_SOCK_DATA_READY, &transport->sock_state);
for (;;) { for (;;) {
skb = skb_recv_udp(sk, 0, 1, &err); skb = skb_recv_udp(sk, 0, 1, &err);
if (skb == NULL) if (skb == NULL)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment