diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 18:55:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 18:55:09 -0400 |
| commit | 61b22e693ea33af02f3380d3dbed9ee65a80c729 (patch) | |
| tree | 4507ddcc055109e35a03820115abd7c09a5d0cdd /net/sunrpc/svcsock.c | |
| parent | 3a3bca5ace9123d1a6b890ceac2902ebf2b1fd50 (diff) | |
| parent | 24b8e05dc1b03c1f80828e642838511c16e17250 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sunrpc/svcsock.c')
| -rw-r--r-- | net/sunrpc/svcsock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 05fe2e735538..51885b5f744e 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
| @@ -1170,8 +1170,7 @@ svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout) | |||
| 1170 | while (rqstp->rq_arghi < pages) { | 1170 | while (rqstp->rq_arghi < pages) { |
| 1171 | struct page *p = alloc_page(GFP_KERNEL); | 1171 | struct page *p = alloc_page(GFP_KERNEL); |
| 1172 | if (!p) { | 1172 | if (!p) { |
| 1173 | set_current_state(TASK_UNINTERRUPTIBLE); | 1173 | schedule_timeout_uninterruptible(msecs_to_jiffies(500)); |
| 1174 | schedule_timeout(HZ/2); | ||
| 1175 | continue; | 1174 | continue; |
| 1176 | } | 1175 | } |
| 1177 | rqstp->rq_argpages[rqstp->rq_arghi++] = p; | 1176 | rqstp->rq_argpages[rqstp->rq_arghi++] = p; |