diff options
author | Tom Tucker <tom@opengridcomputing.com> | 2007-12-30 22:08:05 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-02-01 16:42:12 -0500 |
commit | 4bc6c497b26a7984cac842a09e2e8f8c46242782 (patch) | |
tree | 4b4d4d700ed6539e3b13bc2b66af4bdf179b35aa /net/sunrpc/svcsock.c | |
parent | 6bc5ab1367e43e59671d3fd19e6b0d2e4c138323 (diff) |
svc: Remove sk_lastrecv
With the implementation of the new mark and sweep algorithm for shutting
down old connections, the sk_lastrecv field is no longer needed.
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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 73975547c385..2390286e1827 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
@@ -1606,7 +1606,6 @@ svc_recv(struct svc_rqst *rqstp, long timeout) | |||
1606 | svc_sock_release(rqstp); | 1606 | svc_sock_release(rqstp); |
1607 | return -EAGAIN; | 1607 | return -EAGAIN; |
1608 | } | 1608 | } |
1609 | svsk->sk_lastrecv = get_seconds(); | ||
1610 | clear_bit(XPT_OLD, &svsk->sk_xprt.xpt_flags); | 1609 | clear_bit(XPT_OLD, &svsk->sk_xprt.xpt_flags); |
1611 | 1610 | ||
1612 | rqstp->rq_secure = svc_port_is_privileged(svc_addr(rqstp)); | 1611 | rqstp->rq_secure = svc_port_is_privileged(svc_addr(rqstp)); |
@@ -1706,8 +1705,7 @@ svc_age_temp_sockets(unsigned long closure) | |||
1706 | list_del_init(le); | 1705 | list_del_init(le); |
1707 | svsk = list_entry(le, struct svc_sock, sk_xprt.xpt_list); | 1706 | svsk = list_entry(le, struct svc_sock, sk_xprt.xpt_list); |
1708 | 1707 | ||
1709 | dprintk("queuing svsk %p for closing, %lu seconds old\n", | 1708 | dprintk("queuing svsk %p for closing\n", svsk); |
1710 | svsk, get_seconds() - svsk->sk_lastrecv); | ||
1711 | 1709 | ||
1712 | /* a thread will dequeue and close it soon */ | 1710 | /* a thread will dequeue and close it soon */ |
1713 | svc_xprt_enqueue(&svsk->sk_xprt); | 1711 | svc_xprt_enqueue(&svsk->sk_xprt); |
@@ -1755,7 +1753,6 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv, | |||
1755 | svsk->sk_ostate = inet->sk_state_change; | 1753 | svsk->sk_ostate = inet->sk_state_change; |
1756 | svsk->sk_odata = inet->sk_data_ready; | 1754 | svsk->sk_odata = inet->sk_data_ready; |
1757 | svsk->sk_owspace = inet->sk_write_space; | 1755 | svsk->sk_owspace = inet->sk_write_space; |
1758 | svsk->sk_lastrecv = get_seconds(); | ||
1759 | spin_lock_init(&svsk->sk_lock); | 1756 | spin_lock_init(&svsk->sk_lock); |
1760 | INIT_LIST_HEAD(&svsk->sk_deferred); | 1757 | INIT_LIST_HEAD(&svsk->sk_deferred); |
1761 | 1758 | ||