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 | |
parent | 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 (diff) | |
parent | 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 (diff) |
Merge Christoph's freeze cleanup patch
Diffstat (limited to 'net')
-rw-r--r-- | net/rxrpc/krxiod.c | 2 | ||||
-rw-r--r-- | net/rxrpc/krxsecd.c | 2 | ||||
-rw-r--r-- | net/rxrpc/krxtimod.c | 2 | ||||
-rw-r--r-- | net/sunrpc/svcsock.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/net/rxrpc/krxiod.c b/net/rxrpc/krxiod.c index 2b537f425a17..dada34a77b21 100644 --- a/net/rxrpc/krxiod.c +++ b/net/rxrpc/krxiod.c | |||
@@ -138,7 +138,7 @@ static int rxrpc_krxiod(void *arg) | |||
138 | 138 | ||
139 | _debug("### End Work"); | 139 | _debug("### End Work"); |
140 | 140 | ||
141 | try_to_freeze(PF_FREEZE); | 141 | try_to_freeze(); |
142 | 142 | ||
143 | /* discard pending signals */ | 143 | /* discard pending signals */ |
144 | rxrpc_discard_my_signals(); | 144 | rxrpc_discard_my_signals(); |
diff --git a/net/rxrpc/krxsecd.c b/net/rxrpc/krxsecd.c index 6020c89d9228..1aadd026d354 100644 --- a/net/rxrpc/krxsecd.c +++ b/net/rxrpc/krxsecd.c | |||
@@ -107,7 +107,7 @@ static int rxrpc_krxsecd(void *arg) | |||
107 | 107 | ||
108 | _debug("### End Inbound Calls"); | 108 | _debug("### End Inbound Calls"); |
109 | 109 | ||
110 | try_to_freeze(PF_FREEZE); | 110 | try_to_freeze(); |
111 | 111 | ||
112 | /* discard pending signals */ | 112 | /* discard pending signals */ |
113 | rxrpc_discard_my_signals(); | 113 | rxrpc_discard_my_signals(); |
diff --git a/net/rxrpc/krxtimod.c b/net/rxrpc/krxtimod.c index 249c2b0290bb..3ac81cdd1211 100644 --- a/net/rxrpc/krxtimod.c +++ b/net/rxrpc/krxtimod.c | |||
@@ -90,7 +90,7 @@ static int krxtimod(void *arg) | |||
90 | complete_and_exit(&krxtimod_dead, 0); | 90 | complete_and_exit(&krxtimod_dead, 0); |
91 | } | 91 | } |
92 | 92 | ||
93 | try_to_freeze(PF_FREEZE); | 93 | try_to_freeze(); |
94 | 94 | ||
95 | /* discard pending signals */ | 95 | /* discard pending signals */ |
96 | rxrpc_discard_my_signals(); | 96 | rxrpc_discard_my_signals(); |
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); |