diff options
author | Tom Tucker <tom@opengridcomputing.com> | 2007-12-30 22:08:03 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-02-01 16:42:12 -0500 |
commit | 6bc5ab1367e43e59671d3fd19e6b0d2e4c138323 (patch) | |
tree | 37b94ecc396a3e763677ad741c8b8b5f4fa36518 /net/sunrpc/svcsock.c | |
parent | a6046f71f2b598af241e7496a8ead90f2979224b (diff) |
svc: Move accept call to svc_xprt_received to common code
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>
Diffstat (limited to 'net/sunrpc/svcsock.c')
-rw-r--r-- | net/sunrpc/svcsock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 5fb537e4d63b..73975547c385 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
@@ -1106,8 +1106,6 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt) | |||
1106 | } | 1106 | } |
1107 | memcpy(&newsvsk->sk_local, sin, slen); | 1107 | memcpy(&newsvsk->sk_local, sin, slen); |
1108 | 1108 | ||
1109 | svc_xprt_received(&newsvsk->sk_xprt); | ||
1110 | |||
1111 | if (serv->sv_stats) | 1109 | if (serv->sv_stats) |
1112 | serv->sv_stats->nettcpconn++; | 1110 | serv->sv_stats->nettcpconn++; |
1113 | 1111 | ||
@@ -1591,6 +1589,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout) | |||
1591 | */ | 1589 | */ |
1592 | __module_get(newxpt->xpt_class->xcl_owner); | 1590 | __module_get(newxpt->xpt_class->xcl_owner); |
1593 | svc_check_conn_limits(svsk->sk_xprt.xpt_server); | 1591 | svc_check_conn_limits(svsk->sk_xprt.xpt_server); |
1592 | svc_xprt_received(newxpt); | ||
1594 | } | 1593 | } |
1595 | svc_xprt_received(&svsk->sk_xprt); | 1594 | svc_xprt_received(&svsk->sk_xprt); |
1596 | } else { | 1595 | } else { |