diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /net/sunrpc/svcsock.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-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; |