From: Andrew Morton <akpm@osdl.org>

Cc: Greg Banks <gnb@melbourne.sgi.com>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 net/sunrpc/svcsock.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff -puN net/sunrpc/svcsock.c~knfsd-move-tempsock-aging-to-a-timer-tidy net/sunrpc/svcsock.c
--- a/net/sunrpc/svcsock.c~knfsd-move-tempsock-aging-to-a-timer-tidy
+++ a/net/sunrpc/svcsock.c
@@ -1438,10 +1438,10 @@ svc_setup_socket(struct svc_serv *serv, 
 		serv->sv_tmpcnt++;
 		if (serv->sv_temptimer.function == NULL) {
 			/* setup timer to age temp sockets */
-			serv->sv_temptimer.function = svc_age_temp_sockets;
-			serv->sv_temptimer.data = (unsigned long)serv;
-			serv->sv_temptimer.expires = jiffies + svc_conn_age_period * HZ;
-			add_timer(&serv->sv_temptimer);
+			setup_timer(&serv->sv_temptimer, svc_age_temp_sockets,
+					(unsigned long)serv);
+			mod_timer(&serv->sv_temptimer,
+					jiffies + svc_conn_age_period * HZ);
 		}
 	} else {
 		clear_bit(SK_TEMP, &svsk->sk_flags);
_