1 files changed, 2 insertions, 0 deletions

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 39551657e656..02ded7cfbdcf 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -258,6 +258,8 @@ nfsd(struct svc_rqst *rqstp)
                                 break;
                 err = signo;
         }
+        /* Clear signals before calling lockd_down() and svc_exit_thread() */
+        flush_signals(current);
 
         lock_kernel();