ipr operational timeout oops

PATCH New Brian King 1 participant 1 message May 28, 2004

Subsystems (2)

SCSI IBM Power Linux RAID adapter

lore

Share & tools

lore

Brian King

author maintainer

2004-05-28 02:55 UTC #0 lore raw

PATCH 1/1 ipr operational timeout oops

James,

Here's one more. Please apply.

Thanks

Signature · 3 lines

Brian King
eServer Storage I/O
IBM Linux Technology Center

This patch fixes an oops that can occur if an adapter times out coming operational.

---

 linux-2.6.7-rc1-bjking1/drivers/scsi/ipr.c |    1 +
 1 files changed, 1 insertion(+)

drivers/scsi/ipr.c renamed from drivers/scsi/ipr.c~ipr_ioa_reset_timeout_oops2 +1 -0

diff -puN drivers/scsi/ipr.c~ipr_ioa_reset_timeout_oops2 drivers/scsi/ipr.c
@@ -4818,6 +4818,7 @@ static int ipr_reset_enable_ioa(struct i
 	ipr_cmd->timer.data = (unsigned long) ipr_cmd;
 	ipr_cmd->timer.expires = jiffies + IPR_OPERATIONAL_TIMEOUT;
 	ipr_cmd->timer.function = (void (*)(unsigned long))ipr_timeout;
+	ipr_cmd->done = ipr_reset_ioa_job;
 	add_timer(&ipr_cmd->timer);
 	list_add_tail(&ipr_cmd->queue, &ioa_cfg->pending_q);

Bump driver version

---

 linux-2.6.7-rc1-bjking1/drivers/scsi/ipr.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/scsi/ipr.h renamed from drivers/scsi/ipr.h~ipr_driver_version_2_0_9 +2 -2

diff -puN drivers/scsi/ipr.h~ipr_driver_version_2_0_9 drivers/scsi/ipr.h
@@ -36,8 +36,8 @@
 /*
  * Literals
  */
-#define IPR_DRIVER_VERSION "2.0.8"
-#define IPR_DRIVER_DATE "(May 23, 2004)"
+#define IPR_DRIVER_VERSION "2.0.9"
+#define IPR_DRIVER_DATE "(May 26, 2004)"
 
 /*
  * IPR_DBG_TRACE: Setting this to 1 will turn on some general function tracing