]> err.no Git - linux-2.6/commitdiff
svc: Move accept call to svc_xprt_received to common code
authorTom Tucker <tom@opengridcomputing.com>
Mon, 31 Dec 2007 03:08:03 +0000 (21:08 -0600)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Fri, 1 Feb 2008 21:42:12 +0000 (16:42 -0500)
Now that the svc_xprt_received function handles transports, the call
to svc_xprt_received in the xpo_tcp_accept function can be moved to
common code.

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 5fb537e4d63bc4cbc0a02811fbf2767645b61af9..73975547c385cd93f54984828f682aad3a643130 100644 (file)
@@ -1106,8 +1106,6 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt)
        }
        memcpy(&newsvsk->sk_local, sin, slen);
 
-       svc_xprt_received(&newsvsk->sk_xprt);
-
        if (serv->sv_stats)
                serv->sv_stats->nettcpconn++;
 
@@ -1591,6 +1589,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)
                         */
                        __module_get(newxpt->xpt_class->xcl_owner);
                        svc_check_conn_limits(svsk->sk_xprt.xpt_server);
+                       svc_xprt_received(newxpt);
                }
                svc_xprt_received(&svsk->sk_xprt);
        } else {