Re: [KJ] [announce] 2.6.10-bk13-kj

Nishanth Aravamudan
2005-01-10T18:06:43Z

> all patches:
> ------------

<snip>

> msleep-drivers_scsi_ide-scsi.patch

Please consider replacing with the following patch (just a minor change):

Description: Use msleep() instead of schedule_timeout() to guarantee the
task delays as expected. Remove set_current_state() as it is taken care of by
msleep().

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

--- 2.6.10-v/drivers/scsi/ide-scsi.c 2004-12-24 13:35:01.000000000 -0800
+++ 2.6.10/drivers/scsi/ide-scsi.c 2005-01-05 14:23:05.000000000 -0800
@@ -46,6 +46,7 @@
#include <linux/slab.h>
#include <linux/ide.h>
#include <linux/scatterlist.h>
+#include <linux/delay.h>

#include <asm/io.h>
#include <asm/bitops.h>
@@ -1004,9 +1005,8 @@ static int idescsi_eh_reset (struct scsi
/* ide_do_reset starts a polling handler which restarts itself every 50ms until the reset finishes */

do {
- set_current_state(TASK_UNINTERRUPTIBLE);
spin_unlock_irq(cmd->device->host->host_lock);
- schedule_timeout(HZ/20);
+ msleep(50);
spin_lock_irq(cmd->device->host->host_lock);
} while ( HWGROUP(drive)->handler );