ChangeSet 1.2231.1.93, 2005/03/28 19:42:22-08:00, [EMAIL PROTECTED]
[PATCH] swsusp: Add missing refrigerator calls
This adds few more places where it is possible freeze kernel threads.
From: Nigel Cunningham <[EMAIL PROTECTED]>
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
drivers/media/video/msp3400.c | 8 ++++++--
drivers/media/video/tvaudio.c | 1 +
drivers/pnp/pnpbios/core.c | 6 +++++-
fs/afs/kafsasyncd.c | 2 ++
fs/afs/kafstimod.c | 2 ++
fs/lockd/clntproc.c | 1 +
kernel/signal.c | 2 ++
net/rxrpc/krxiod.c | 2 ++
net/rxrpc/krxsecd.c | 2 ++
net/rxrpc/krxtimod.c | 2 ++
net/sunrpc/svcsock.c | 1 +
11 files changed, 26 insertions(+), 3 deletions(-)
diff -Nru a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
--- a/drivers/media/video/msp3400.c 2005-03-28 21:27:00 -08:00
+++ b/drivers/media/video/msp3400.c 2005-03-28 21:27:00 -08:00
@@ -734,6 +734,7 @@
{
DECLARE_WAITQUEUE(wait, current);
+again:
add_wait_queue(&msp->wq, &wait);
if (!kthread_should_stop()) {
if (timeout < 0) {
@@ -749,9 +750,12 @@
#endif
}
}
- if (current->flags & PF_FREEZE)
- refrigerator(PF_FREEZE);
+
remove_wait_queue(&msp->wq, &wait);
+
+ if (try_to_freeze(PF_FREEZE))
+ goto again;
+
return msp->restart;
}
diff -Nru a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
--- a/drivers/media/video/tvaudio.c 2005-03-28 21:27:00 -08:00
+++ b/drivers/media/video/tvaudio.c 2005-03-28 21:27:00 -08:00
@@ -286,6 +286,7 @@
schedule();
}
remove_wait_queue(&chip->wq, &wait);
+ try_to_freeze(PF_FREEZE);
if (chip->done || signal_pending(current))
break;
dprintk("%s: thread wakeup\n", i2c_clientname(&chip->c));
diff -Nru a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
--- a/drivers/pnp/pnpbios/core.c 2005-03-28 21:26:59 -08:00
+++ b/drivers/pnp/pnpbios/core.c 2005-03-28 21:27:00 -08:00
@@ -180,8 +180,12 @@
* Poll every 2 seconds
*/
msleep_interruptible(2000);
- if(signal_pending(current))
+
+ if(signal_pending(current)) {
+ if (try_to_freeze(PF_FREEZE))
+ continue;
break;
+ }
status = pnp_bios_dock_station_info(&now);
diff -Nru a/fs/afs/kafsasyncd.c b/fs/afs/kafsasyncd.c
--- a/fs/afs/kafsasyncd.c 2005-03-28 21:27:00 -08:00
+++ b/fs/afs/kafsasyncd.c 2005-03-28 21:27:00 -08:00
@@ -116,6 +116,8 @@
remove_wait_queue(&kafsasyncd_sleepq, &myself);
set_current_state(TASK_RUNNING);
+ try_to_freeze(PF_FREEZE);
+
/* discard pending signals */
afs_discard_my_signals();
diff -Nru a/fs/afs/kafstimod.c b/fs/afs/kafstimod.c
--- a/fs/afs/kafstimod.c 2005-03-28 21:27:00 -08:00
+++ b/fs/afs/kafstimod.c 2005-03-28 21:27:00 -08:00
@@ -91,6 +91,8 @@
complete_and_exit(&kafstimod_dead, 0);
}
+ try_to_freeze(PF_FREEZE);
+
/* discard pending signals */
afs_discard_my_signals();
diff -Nru a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
--- a/fs/lockd/clntproc.c 2005-03-28 21:27:00 -08:00
+++ b/fs/lockd/clntproc.c 2005-03-28 21:27:00 -08:00
@@ -312,6 +312,7 @@
prepare_to_wait(queue, &wait, TASK_INTERRUPTIBLE);
if (!signalled ()) {
schedule_timeout(NLMCLNT_GRACE_WAIT);
+ try_to_freeze(PF_FREEZE);
if (!signalled ())
status = 0;
}
diff -Nru a/kernel/signal.c b/kernel/signal.c
--- a/kernel/signal.c 2005-03-28 21:27:00 -08:00
+++ b/kernel/signal.c 2005-03-28 21:27:00 -08:00
@@ -2219,6 +2219,8 @@
current->state = TASK_INTERRUPTIBLE;
timeout = schedule_timeout(timeout);
+ if (current->flags & PF_FREEZE)
+ refrigerator(PF_FREEZE);
spin_lock_irq(¤t->sighand->siglock);
sig = dequeue_signal(current, &these, &info);
current->blocked = current->real_blocked;
diff -Nru a/net/rxrpc/krxiod.c b/net/rxrpc/krxiod.c
--- a/net/rxrpc/krxiod.c 2005-03-28 21:26:59 -08:00
+++ b/net/rxrpc/krxiod.c 2005-03-28 21:26:59 -08:00
@@ -138,6 +138,8 @@
_debug("### End Work");
+ try_to_freeze(PF_FREEZE);
+
/* discard pending signals */
rxrpc_discard_my_signals();
diff -Nru a/net/rxrpc/krxsecd.c b/net/rxrpc/krxsecd.c
--- a/net/rxrpc/krxsecd.c 2005-03-28 21:27:00 -08:00
+++ b/net/rxrpc/krxsecd.c 2005-03-28 21:27:00 -08:00
@@ -107,6 +107,8 @@
_debug("### End Inbound Calls");
+ try_to_freeze(PF_FREEZE);
+
/* discard pending signals */
rxrpc_discard_my_signals();
diff -Nru a/net/rxrpc/krxtimod.c b/net/rxrpc/krxtimod.c
--- a/net/rxrpc/krxtimod.c 2005-03-28 21:27:00 -08:00
+++ b/net/rxrpc/krxtimod.c 2005-03-28 21:27:00 -08:00
@@ -90,6 +90,8 @@
complete_and_exit(&krxtimod_dead, 0);
}
+ try_to_freeze(PF_FREEZE);
+
/* discard pending signals */
rxrpc_discard_my_signals();
diff -Nru a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
--- a/net/sunrpc/svcsock.c 2005-03-28 21:27:00 -08:00
+++ b/net/sunrpc/svcsock.c 2005-03-28 21:27:00 -08:00
@@ -1186,6 +1186,7 @@
arg->len = (pages-1)*PAGE_SIZE;
arg->tail[0].iov_len = 0;
+ try_to_freeze(PF_FREEZE);
if (signalled())
return -EINTR;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
