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)) {