diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index cb659ef789c086d8067c3edd1036ce6f7c2470c9..4acf0ebd9802a759042a76c8c5779e1ca58b6468 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -274,6 +274,8 @@ static void lockd_down_net(struct svc_serv *serv, struct net *net)
 	if (ln->nlmsvc_users) {
 		if (--ln->nlmsvc_users == 0) {
 			nlm_shutdown_hosts_net(net);
+			cancel_delayed_work_sync(&ln->grace_period_end);
+			locks_end_grace(&ln->lockd_manager);
 			svc_shutdown_net(serv, net);
 			dprintk("%s: per-net data destroyed; net=%x\n",
 				__func__, net->ns.inum);