Skip to contentSkip to conversation

allow sleeping in ->eh_device_reset_handler()

SCSI Dave Jones 1 participant 1 message Jun 20, 2005 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Dave Jones

author
#1 lore raw
Quoted 8 lines · Linux Kernel

tree 1609752ea7a9adb28583147f0bea33a9f10877d7
parent 8fa728a26886f56a9ee10a44fea0ddda301d21c3
author Jeff Garzik <[email protected]> Sat, 28 May 2005 15:55:48 -0400 committer Jeff Garzik <[email protected]> Fri, 17 Jun 2005 22:05:03 -0500

[SCSI] allow sleeping in ->eh_device_reset_handler()

.. deletia ...

Quoted 18 lines

===================================================================

drivers/scsi/megaraid.c (mode:100644 sha1:80b0c40c522b7023369c6498ad24165892b8ff55) renamed from drivers/scsi/megaraid.c (mode:100644 sha1:8d707b29027da4dcab34942adcc7aac9f5e11a8e) +3 -1
@@ -1938,7 +1938,7 @@ megaraid_abort(Scsi_Cmnd *cmd)
 
 
 static int
-megaraid_reset(Scsi_Cmnd *cmd)
+__megaraid_reset(Scsi_Cmnd *cmd)
 {
 	adapter_t	*adapter;
 	megacmd_t	mc;
@@ -1972,6 +1972,18 @@ megaraid_reset(Scsi_Cmnd *cmd)
 	return rval;
 }
 
+static int
+megaraid_reset(Scsi_Cmnd *cmd)

drivers/scsi/megaraid.c (mode:100644 sha1:80b0c40c522b7023369c6498ad24165892b8ff55) megaraid_reset(Scsi_Cmnd *cmd) · line 1986

Quoted 10 lines
drivers/scsi/megaraid.c (mode:100644 sha1:80b0c40c522b7023369c6498ad24165892b8ff55) renamed from drivers/scsi/megaraid.c (mode:100644 sha1:8d707b29027da4dcab34942adcc7aac9f5e11a8e) +10 -0
+{
+	adapter = (adapter_t *)cmd->device->host->hostdata;
+	int rc;
+
+	spin_lock_irq(&adapter->lock);
+	rc = __megaraid_reset(cmd);
+	spin_unlock_irq(&adapter->lock);
+
+	return rc;
+}

This doesn't compile.

drivers/scsi/megaraid.c:1978: error: 'adapter' undeclared (first use in this function) drivers/scsi/megaraid.c:1978: error: (Each undeclared identifier is reported only once drivers/scsi/megaraid.c:1978: error: for each function it appears in.) drivers/scsi/megaraid.c:1979: warning: ISO C90 forbids mixed declarations and code

This should fix it.. (untested due to lack of hardware)

drivers/scsi/megaraid.c renamed from drivers/scsi/megaraid.c~ +3 -1
@@ -1975,9 +1975,11 @@ __megaraid_reset(Scsi_Cmnd *cmd)
 static int
 megaraid_reset(Scsi_Cmnd *cmd)
 {
-	adapter = (adapter_t *)cmd->device->host->hostdata;
+	adapter_t *adapter;
 	int rc;
 
+	adapter = cmd->device->host->hostdata;
+
 	spin_lock_irq(&adapter->lock);
 	rc = __megaraid_reset(cmd);
 	spin_unlock_irq(&adapter->lock);