]> err.no Git - linux-2.6/commitdiff
svc: Remove unnecessary call to svc_sock_enqueue
authorTom Tucker <tom@opengridcomputing.com>
Mon, 31 Dec 2007 03:07:38 +0000 (21:07 -0600)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Fri, 1 Feb 2008 21:42:09 +0000 (16:42 -0500)
The svc_tcp_accept function calls svc_sock_enqueue after setting the
SK_CONN bit. This doesn't actually do anything because the SK_BUSY bit
is still set. The call is unnecessary anyway because the generic code in
svc_recv calls svc_sock_received after calling the accept function.

Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
Acked-by: Neil Brown <neilb@suse.de>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Greg Banks <gnb@sgi.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
net/sunrpc/svcsock.c

index 41d1f815fbbd9c42dd696f05d23540190d92b550..962dbf43a72885bbe0f41bab4e560b76a4e41ee2 100644 (file)
@@ -1064,7 +1064,6 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt)
        }
 
        set_bit(SK_CONN, &svsk->sk_flags);
-       svc_sock_enqueue(svsk);
 
        err = kernel_getpeername(newsock, sin, &slen);
        if (err < 0) {