[KJ] [PATCH 7/22] ftape/fdc-io: insert set_current_state() before

[KJ] [PATCH 7/22] ftape/fdc-io: insert set_current_state() before

[Nishanth Aravamudan]

[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]

Hi,

Please consider applying.

Description: Inserts a set_current_state(TASK_INTERRUPTIBLE) before the
schedule_timeout() call. Without this change, after the first iteration of the
loop, schedule_timeout() will not only return immediately, but the loop will
break, as the conditional will no longer be satisfied. In fact, this conditional
makes little sense given the workings of schedule_timeout. The timeout variable
is ignored, as well, and I'm fairly certain that it should be included in the
loop conditional. That way, if the timeout expires before a signal hits, -ETIME
will be returned by fdc_interrupt_wait() instead of -EINTR.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>


--- 2.6.11-rc1-kj-v/drivers/char/ftape/lowlevel/fdc-io.c	2005-01-15 16:55:41.000000000 -0800
+++ 2.6.11-rc1-kj/drivers/char/ftape/lowlevel/fdc-io.c	2005-01-17 13:12:29.000000000 -0800
@@ -387,7 +387,8 @@ int fdc_interrupt_wait(unsigned int time
 
 	set_current_state(TASK_INTERRUPTIBLE);
 	add_wait_queue(&ftape_wait_intr, &wait);
-	while (!ft_interrupt_seen && (current->state == TASK_INTERRUPTIBLE)) {
+	while (!ft_interrupt_seen && timeout) {
+		set_current_state(TASK_INTERRUPTIBLE);
 		timeout = schedule_timeout(timeout);
         }
 

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors