Merge tag 'nfsd-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

[linux-block.git] / net / sunrpc / svc.c

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index b1da586c44765bddf99157e37efc83cec6501b48..f06622814a958a5248d8407dd60024360c9019c9 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -567,7 +567,7 @@ svc_destroy(struct kref *ref)
        struct svc_serv *serv = container_of(ref, struct svc_serv, sv_refcnt);
 
        dprintk("svc: svc_destroy(%s)\n", serv->sv_program->pg_name);
-       del_timer_sync(&serv->sv_temptimer);
+       timer_shutdown_sync(&serv->sv_temptimer);
 
        /*
         * The last user is gone and thus all sockets have to be destroyed to