Prev: [083/156] sunrpc: handle allocation errors from __rpc_lookup_create()
Next: [006/156] ALSA: hda - Sound MSI fallout on a Asus mobo NVIDIA MCP55
From: Greg KH on 30 Mar 2010 19:50
2.6.33-stable review patch. If anyone has any objections, please let us know.

------------------

From: Neil Brown <neilb(a)suse.de>

commit 301e99ce4a2f42a317129230fd42e6cd874c64b0 upstream.

One the changes in commit d7979ae4a "svc: Move close processing to a
single place" is:

err_delete:
- svc_delete_socket(svsk);
+ set_bit(SK_CLOSE, &svsk->sk_flags);
return -EAGAIN;

This is insufficient. The recvfrom methods must always call
svc_xprt_received on completion so that the socket gets re-queued if
there is any more work to do. This particular path did not make that
call because it actually destroyed the svsk, making requeue pointless.
When the svc_delete_socket was change to just set a bit, we should have
added a call to svc_xprt_received,

This is the problem that b0401d7253 attempted to fix, incorrectly.

Signed-off-by: J. Bruce Fields <bfields(a)citi.umich.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
net/sunrpc/svcsock.c | 1 +
1 file changed, 1 insertion(+)

--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -968,6 +968,7 @@ static int svc_tcp_recv_record(struct sv
return len;
err_delete:
set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags);
+ svc_xprt_received(&svsk->sk_xprt);
err_again:
return -EAGAIN;
}


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [083/156] sunrpc: handle allocation errors from __rpc_lookup_create()
Next: [006/156] ALSA: hda - Sound MSI fallout on a Asus mobo NVIDIA MCP55