ieee1394/nodemgr: replace schedule_timeout() with msleep_interruptible()

PATCH New [email protected] 1 participant 1 message Sep 23, 2004

lore

Share & tools

lore

[email protected]

author

2004-09-23 20:59 UTC #0 lore raw

PATCH 1/2 ieee1394/nodemgr: replace schedule_timeout() with msleep_interruptible()

Any comments would be appreciated.

Description: Uses msleep_interruptible() in place of schedule_timeout() to guarantee the task delays as expected.

Signed-off-by Nishanth Aravamudan <[email protected]>

Signed-off-by Maximilian Attems <[email protected]>

---

 linux-2.6.9-rc2-bk7-max/drivers/ieee1394/nodemgr.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

drivers/ieee1394/nodemgr.c renamed from drivers/ieee1394/nodemgr.c~msleep_interruptible-drivers_ieee1394_nodemgr +2 -3

diff -puN drivers/ieee1394/nodemgr.c~msleep_interruptible-drivers_ieee1394_nodemgr drivers/ieee1394/nodemgr.c
@@ -70,8 +70,7 @@ static int nodemgr_bus_read(struct csr12
 		if (!ret)
 			break;
 
-		set_current_state(TASK_INTERRUPTIBLE);
-		if (schedule_timeout (HZ/3))
+		if (msleep_interruptible(334))
 			return -EINTR;
 	}

@@ -1496,7 +1495,7 @@ static int nodemgr_host_thread(void *__h
 		 * to make sure things settle down. */
 		for (i = 0; i < 4 ; i++) {
 			set_current_state(TASK_INTERRUPTIBLE);
-			if (schedule_timeout(HZ/16)) {
+			if (msleep_interruptible(63)) {
 				up(&nodemgr_serialize);
 				goto caught_signal;
 			}