From d5dc3b16ce899e0fb5ea0a19e84b176f37888a26 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 25 Mar 2013 07:59:57 -0400
Subject: [PATCH] --- yaml --- r: 367289 b: refs/heads/master c:
 25d280aad82e559cc7bc762410cd35ea5b98e294 h: refs/heads/master i:   367287:
 9102743b4ec5bb4cef9aee76352fb03fcf5aca14 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfs/callback.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f2d7a21a0fa0..e962e2a4e237 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 809b426c7fc46b07065eb382c0289710c34b37e4
+refs/heads/master: 25d280aad82e559cc7bc762410cd35ea5b98e294
diff --git a/trunk/fs/nfs/callback.c b/trunk/fs/nfs/callback.c
index 5088b57b078a..cff089a412c7 100644
--- a/trunk/fs/nfs/callback.c
+++ b/trunk/fs/nfs/callback.c
@@ -125,6 +125,9 @@ nfs41_callback_svc(void *vrqstp)
 	set_freezable();
 
 	while (!kthread_should_stop()) {
+		if (try_to_freeze())
+			continue;
+
 		prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE);
 		spin_lock_bh(&serv->sv_cb_lock);
 		if (!list_empty(&serv->sv_cb_list)) {