Skip to contentSkip to conversation

scsi/st: replace schedule_timeout() with msleep_interruptible()

PATCH In review [email protected] 2 participants 2 messages Mar 6, 2005 – Mar 7, 2005

Subsystems (2)
SCSI SCSI tape driver
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 2/11 scsi/st: replace schedule_timeout() with msleep_interruptible()

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

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

---

 kj-domen/drivers/scsi/st.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
drivers/scsi/st.c renamed from drivers/scsi/st.c~msleep_interruptible-drivers_scsi_st +2 -3
diff -puN drivers/scsi/st.c~msleep_interruptible-drivers_scsi_st drivers/scsi/st.c
@@ -36,6 +36,7 @@ static char *verstr = "20041025";
 #include <linux/moduleparam.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/cdev.h>
+#include <linux/delay.h>
 #include <asm/uaccess.h>
 #include <asm/dma.h>
 #include <asm/system.h>

@@ -760,9 +761,7 @@ static int test_ready(struct scsi_tape *
 
 			if (scode == NOT_READY) {
 				if (waits < max_wait) {
-					set_current_state(TASK_INTERRUPTIBLE);
-					schedule_timeout(HZ);
-					if (signal_pending(current)) {
+					if (msleep_interruptible(1000)) {
 						retval = (-EINTR);
 						break;
 					}

_

#1 lore raw
Quoted 5 lines · On Sun, 6 Mar 2005 [email protected] wrote:

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

This patch is already in the scsi-misc-2.6 tree merged into one of the st patches.

Thanks for the reminder and the patch.

Signature · 1 line
Kai