---

yaml --- r: 92819 b: refs/heads/master c: 7b54fe6 h: refs/heads/master i: 92817: b2d7a1e 92815: 04db4be v: v3
git-mirror · Apr 23, 2008 · 4a2c2a1 · 4a2c2a1
1 parent 836cd1e
commit 4a2c2a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6aaa67b5f3b9fe24f0c76d0415cc72e5a1137bea
+refs/heads/master: 7b54fe61ffd5bfa4e50d371a2415225aa0cbb38e
diff --git a/trunk/net/sunrpc/svc_xprt.c b/trunk/net/sunrpc/svc_xprt.c
@@ -587,10 +587,12 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
 		while (rqstp->rq_pages[i] == NULL) {
 			struct page *p = alloc_page(GFP_KERNEL);
 			if (!p) {
-				int j = msecs_to_jiffies(500);
-				if (kthread_should_stop())
+				set_current_state(TASK_INTERRUPTIBLE);
+				if (signalled() || kthread_should_stop()) {
+					set_current_state(TASK_RUNNING);
 					return -EINTR;
-				schedule_timeout_uninterruptible(j);
+				}
+				schedule_timeout(msecs_to_jiffies(500));
 			}
 			rqstp->rq_pages[i] = p;
 		}