Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4bc6c497b26a7984cac842a09e2e8f8c46242782 Commit: 4bc6c497b26a7984cac842a09e2e8f8c46242782 Parent: 6bc5ab1367e43e59671d3fd19e6b0d2e4c138323 Author: Tom Tucker <[EMAIL PROTECTED]> AuthorDate: Sun Dec 30 21:08:05 2007 -0600 Committer: J. Bruce Fields <[EMAIL PROTECTED]> CommitDate: Fri Feb 1 16:42:12 2008 -0500
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 <[EMAIL PROTECTED]> Acked-by: Neil Brown <[EMAIL PROTECTED]> Reviewed-by: Chuck Lever <[EMAIL PROTECTED]> Reviewed-by: Greg Banks <[EMAIL PROTECTED]> Signed-off-by: J. Bruce Fields <[EMAIL PROTECTED]> --- include/linux/sunrpc/svcsock.h | 1 - net/sunrpc/svcsock.c | 5 +---- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h index 41c2dfa..406d003 100644 --- a/include/linux/sunrpc/svcsock.h +++ b/include/linux/sunrpc/svcsock.h @@ -33,7 +33,6 @@ struct svc_sock { /* private TCP part */ int sk_reclen; /* length of record */ int sk_tcplen; /* current read length */ - time_t sk_lastrecv; /* time of last received request */ /* cache of various info for TCP sockets */ void *sk_info_authunix; diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 7397554..2390286 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1606,7 +1606,6 @@ svc_recv(struct svc_rqst *rqstp, long timeout) svc_sock_release(rqstp); return -EAGAIN; } - svsk->sk_lastrecv = get_seconds(); clear_bit(XPT_OLD, &svsk->sk_xprt.xpt_flags); rqstp->rq_secure = svc_port_is_privileged(svc_addr(rqstp)); @@ -1706,8 +1705,7 @@ svc_age_temp_sockets(unsigned long closure) list_del_init(le); svsk = list_entry(le, struct svc_sock, sk_xprt.xpt_list); - dprintk("queuing svsk %p for closing, %lu seconds old\n", - svsk, get_seconds() - svsk->sk_lastrecv); + dprintk("queuing svsk %p for closing\n", svsk); /* a thread will dequeue and close it soon */ svc_xprt_enqueue(&svsk->sk_xprt); @@ -1755,7 +1753,6 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv, svsk->sk_ostate = inet->sk_state_change; svsk->sk_odata = inet->sk_data_ready; svsk->sk_owspace = inet->sk_write_space; - svsk->sk_lastrecv = get_seconds(); spin_lock_init(&svsk->sk_lock); INIT_LIST_HEAD(&svsk->sk_deferred); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html