aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/sunrpc/svcsock.h1
-rw-r--r--net/sunrpc/svcsock.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index 41c2dfaf7371..406d0031b989 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -33,7 +33,6 @@ struct svc_sock {
33 /* private TCP part */ 33 /* private TCP part */
34 int sk_reclen; /* length of record */ 34 int sk_reclen; /* length of record */
35 int sk_tcplen; /* current read length */ 35 int sk_tcplen; /* current read length */
36 time_t sk_lastrecv; /* time of last received request */
37 36
38 /* cache of various info for TCP sockets */ 37 /* cache of various info for TCP sockets */
39 void *sk_info_authunix; 38 void *sk_info_authunix;
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