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>

diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index 41c2dfaf73713a45c1a9ae640a595c6a02d8ba9e..406d0031b989bda0256a14641cff4c676c838f7c 100644 (file)
--- 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 73975547c385cd93f54984828f682aad3a643130..2390286e1827c512a3b7ec14c35fe9e780ec9163 100644 (file)
--- 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);