diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 20:16:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 20:16:53 -0400 |
| commit | 2031d0f586839bc68f35bcf8580b18947f8491d4 (patch) | |
| tree | e317615b4cb62350edeea0afe0a4fc94152cee29 /net/sunrpc | |
| parent | 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 (diff) | |
| parent | 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 (diff) | |
Merge Christoph's freeze cleanup patch
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/svcsock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 05907035bc96..56db8f13e6cb 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
| @@ -1185,8 +1185,8 @@ svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout) | |||
| 1185 | arg->page_len = (pages-2)*PAGE_SIZE; | 1185 | arg->page_len = (pages-2)*PAGE_SIZE; |
| 1186 | arg->len = (pages-1)*PAGE_SIZE; | 1186 | arg->len = (pages-1)*PAGE_SIZE; |
| 1187 | arg->tail[0].iov_len = 0; | 1187 | arg->tail[0].iov_len = 0; |
| 1188 | 1188 | ||
| 1189 | try_to_freeze(PF_FREEZE); | 1189 | try_to_freeze(); |
| 1190 | if (signalled()) | 1190 | if (signalled()) |
| 1191 | return -EINTR; | 1191 | return -EINTR; |
| 1192 | 1192 | ||
| @@ -1227,7 +1227,7 @@ svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout) | |||
| 1227 | 1227 | ||
| 1228 | schedule_timeout(timeout); | 1228 | schedule_timeout(timeout); |
| 1229 | 1229 | ||
| 1230 | try_to_freeze(PF_FREEZE); | 1230 | try_to_freeze(); |
| 1231 | 1231 | ||
| 1232 | spin_lock_bh(&serv->sv_lock); | 1232 | spin_lock_bh(&serv->sv_lock); |
| 1233 | remove_wait_queue(&rqstp->rq_wait, &wait); | 1233 | remove_wait_queue(&rqstp->rq_wait, &wait); |