Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bc6c497 authored by Tom Tucker's avatar Tom Tucker Committed by J. Bruce Fields
Browse files

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: default avatarTom Tucker <tom@opengridcomputing.com>
Acked-by: default avatarNeil Brown <neilb@suse.de>
Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarGreg Banks <gnb@sgi.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 6bc5ab13

include/linux/sunrpc/svcsock.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

net/sunrpc/svcsock.c

+1 −4
Original line number Diff line number Diff line
@@ -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);