2 files changed, 6 insertions, 4 deletions

diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index fd77ed1d71..14b3ce87fa 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -313,7 +313,7 @@ static int nlm_wait_on_grace(wait_queue_head_t *queue)
         prepare_to_wait(queue, &wait, TASK_INTERRUPTIBLE);
         if (!signalled ()) {
                 schedule_timeout(NLMCLNT_GRACE_WAIT);
-                try_to_freeze(PF_FREEZE);
+                try_to_freeze();
                 if (!signalled ())
                         status = 0;
         }
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index b82e470912..12a857c29e 100644
--- a/fs/lockd/svc.c
+++ b/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);
 
@@ -329,7 +331,7 @@ static ctl_table nlm_sysctls[] = {
                 .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "nlm_grace_period",
                 .data           = &nlm_grace_period,
-                .maxlen         = sizeof(int),
+                .maxlen         = sizeof(unsigned long),
                 .mode           = 0644,
                 .proc_handler   = &proc_doulongvec_minmax,
                 .extra1         = (unsigned long *) &nlm_grace_period_min,
@@ -339,7 +341,7 @@ static ctl_table nlm_sysctls[] = {
                 .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "nlm_timeout",
                 .data           = &nlm_timeout,
-                .maxlen         = sizeof(int),
+                .maxlen         = sizeof(unsigned long),
                 .mode           = 0644,
                 .proc_handler   = &proc_doulongvec_minmax,
                 .extra1         = (unsigned long *) &nlm_timeout_min,