[patch 4/10] s390: schedule_timeout cleanup in ctctty

From: Frank Pavlic
Date: Fri May 27 2005 - 04:31:12 EST



[patch 4/10] s390: schedule_timeout cleanup in ctctty.

From: Domen Puncer <domen@xxxxxxxxxxxx>

Use msleep_interruptible() instead of schedule_timeout()
to guarantee the task delays as expected.

Signed-off-by: Nishanth Aravamudan <nacc@xxxxxxxxxx>
Signed-off-by: Maximilian Attems <janitor@xxxxxxxxxxxxxx>
Signed-off-by: Domen Puncer <domen@xxxxxxxxxxxx>
Signed-off-by: Frank Pavlic <pavlic@xxxxxxxxxx>
Acked-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

diffstat:
drivers/s390/net/ctctty.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)

diff -urpN linux-2.6/drivers/s390/net/ctctty.c linux-2.6-patched/drivers/s390/net/ctctty.c
--- linux-2.6/drivers/s390/net/ctctty.c 2005-05-06 11:25:57.000000000 +0200
+++ linux-2.6-patched/drivers/s390/net/ctctty.c 2005-05-06 11:26:14.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: ctctty.c,v 1.26 2004/08/04 11:06:55 mschwide Exp $
+ * $Id: ctctty.c,v 1.29 2005/04/05 08:50:44 mschwide Exp $
*
* CTC / ESCON network driver, tty interface.
*
@@ -1056,8 +1056,7 @@ ctc_tty_close(struct tty_struct *tty, st
info->tty = 0;
tty->closing = 0;
if (info->blocked_open) {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/2);
+ msleep_interruptible(500);
wake_up_interruptible(&info->open_wait);
}
info->flags &= ~(CTC_ASYNC_NORMAL_ACTIVE | CTC_ASYNC_CLOSING);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/