diff --git a/[refs] b/[refs]
index 856d76ef97dd..7fdf9b5d3096 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13cd21845d6a9729ca95e36ae6e8c669623fbfd4
+refs/heads/master: 46be925fa6f4796e732e16a020fa0ef9d48ea7c8
diff --git a/trunk/fs/lockd/svc.c b/trunk/fs/lockd/svc.c
index b82e470912e8..6e242556b903 100644
--- a/trunk/fs/lockd/svc.c
+++ b/trunk/fs/lockd/svc.c
@@ -191,7 +191,9 @@ lockd(struct svc_rqst *rqstp)
 		printk(KERN_DEBUG
 			"lockd: new process, skipping host shutdown\n");
 	wake_up(&lockd_exit);
-		
+
+	flush_signals(current);
+
 	/* Exit the RPC thread */
 	svc_exit_thread(rqstp);