public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
* changes to ieee1394/sbp2 outside of linux1394.org
@ 2005-07-09 12:37 Stefan Richter
  2005-07-09 15:18 ` James Bottomley
  0 siblings, 1 reply; 66+ messages in thread
From: Stefan Richter @ 2005-07-09 12:37 UTC (permalink / raw)
  To: linux-scsi, linux1394-devel

Hi linux-scsi people and linux1394 people,

there are a few changes to sbp2 in linux-2.6.13 (-rc2) that were not
merged back into the linux1394.org repository (and were not tested by
linux1394 maintainers as far as I have heard). Most of these changes
deal with TYPE_RBC devices.

Previous discussion:
 - "TYPE_RBC cache fixes (sbp2.c affected)"
   http://marc.theaimsgroup.com/?t=111620896500001

 - "Problems with Firewire and -mm kernels"
   http://marc.theaimsgroup.com/?t=111994463000003
   http://marc.theaimsgroup.com/?t=112027470800001
   http://marc.theaimsgroup.com/?t=112029841400001

I have one question for now: Is the following part of the diff related
to the TYPE_RBC issue, or is it unrelated? As you can see, locking is
removed from sbp2scsi_complete_command() but added to sbp2scsi_reset():


--- ieee1394_linux1394.org/sbp2.c	2005-07-03 12:29:55.000000000 +0200
+++ linux-2.6.13-rc2/drivers/ieee1394/sbp2.c	2005-07-06 05:46:33.000000000 +0200
@@ -2580,8 +2454,6 @@ static void sbp2scsi_complete_command(st
 				      u32 scsi_status, struct scsi_cmnd *SCpnt,
 				      void (*done)(struct scsi_cmnd *))
 {
-	unsigned long flags;
-
 	SBP2_DEBUG("sbp2scsi_complete_command");
 
 	/*
@@ -2680,11 +2552,7 @@ static void sbp2scsi_complete_command(st
 	/*
 	 * Tell scsi stack that we're done with this command
 	 */
-	spin_lock_irqsave(scsi_id->scsi_host->host_lock,flags);
 	done (SCpnt);
-	spin_unlock_irqrestore(scsi_id->scsi_host->host_lock,flags);
-
-	return;
 }
 
 
@@ -2747,7 +2616,7 @@ static int sbp2scsi_abort(struct scsi_cm
 /*
  * Called by scsi stack when something has really gone wrong.
  */
-static int sbp2scsi_reset(struct scsi_cmnd *SCpnt)
+static int __sbp2scsi_reset(struct scsi_cmnd *SCpnt)
 {
 	struct scsi_id_instance_data *scsi_id =
 		(struct scsi_id_instance_data *)SCpnt->device->host->hostdata[0];
@@ -2762,6 +2631,18 @@ static int sbp2scsi_reset(struct scsi_cm
 	return(SUCCESS);
 }
 
+static int sbp2scsi_reset(struct scsi_cmnd *SCpnt)
+{
+	unsigned long flags;
+	int rc;
+
+	spin_lock_irqsave(SCpnt->device->host->host_lock, flags);
+	rc = __sbp2scsi_reset(SCpnt);
+	spin_unlock_irqrestore(SCpnt->device->host->host_lock, flags);
+
+	return rc;
+}
+
 static const char *sbp2scsi_info (struct Scsi_Host *host)
 {
         return "SCSI emulation for IEEE-1394 SBP-2 Devices";



Thanks in advance for clarification.
-- 
Stefan Richter
-=====-=-=-= -=== -=--=
http://arcgraph.de/sr/


^ permalink raw reply	[flat|nested] 66+ messages in thread

end of thread, other threads:[~2005-07-20  0:21 UTC | newest]

Thread overview: 66+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-07-09 12:37 changes to ieee1394/sbp2 outside of linux1394.org Stefan Richter
2005-07-09 15:18 ` James Bottomley
2005-07-09 16:27   ` Ben Collins
2005-07-09 16:35     ` James Bottomley
2005-07-09 16:56       ` Stefan Richter
2005-07-09 17:24         ` James Bottomley
2005-07-15  0:53         ` Rogério Brito
2005-07-15  1:43           ` Ben Collins
2005-07-15  6:36             ` Stefan Richter
2005-07-15 15:30               ` Rogério Brito
2005-07-15 15:15             ` Rogério Brito
2005-07-15 15:53             ` Rogério Brito
2005-07-15 17:28               ` Ben Collins
2005-07-15 18:50                 ` Rogério Brito
2005-07-15 20:57                   ` Ben Collins
2005-07-15 21:44                     ` Stefan Richter
2005-07-16  2:10                       ` Rogério Brito
2005-07-16  1:42                     ` Rogério Brito
2005-07-16 15:56                       ` Ben Collins
2005-07-16 16:42                         ` Rogério Brito
2005-07-16 18:10                           ` Stefan Richter
2005-07-16 19:34                             ` Rogério Brito
2005-07-17 16:57                           ` Ben Collins
2005-07-17 19:18                             ` Rogério Brito
2005-07-17 19:46                               ` Stefan Richter
2005-07-18  0:14                                 ` Rogério Brito
2005-07-17 23:27                                   ` Stefan Richter
2005-07-18  4:50                                     ` Philipp Slusallek
2005-07-18  7:13                                       ` Stefan Richter
2005-07-18  8:18                                       ` Rogério Brito
2005-07-20  0:20                                         ` Rogério Brito
2005-07-09 17:49       ` Ben Collins
2005-07-09 18:41         ` James Bottomley
2005-07-09 19:22           ` Ben Collins
2005-07-09 16:37     ` Arjan van de Ven
2005-07-09 17:53       ` Ben Collins
2005-07-09 17:00     ` Stefan Richter
2005-07-09 17:51       ` Ben Collins
2005-07-09 17:57         ` Arjan van de Ven
2005-07-09 18:12           ` Ben Collins
2005-07-09 18:38     ` James Bottomley
2005-07-09 23:06   ` Ben Collins
2005-07-10  3:34     ` Jeff Garzik
2005-07-10  4:36       ` Ben Collins
2005-07-10 15:25         ` James Bottomley
2005-07-10 15:58           ` Ben Collins
2005-07-10 17:05             ` James Bottomley
2005-07-10 17:33               ` Ben Collins
2005-07-10 17:34           ` Stefan Richter
2005-07-10 18:14             ` James Bottomley
2005-07-10 20:13               ` Stefan Richter
2005-07-10 20:27                 ` Ben Collins
2005-07-10 21:24                   ` Stefan Richter
2005-07-10 22:06                     ` Stefan Richter
2005-07-10 22:16                       ` (summary) " Stefan Richter
2005-07-10 22:32                       ` Stefan Richter
2005-07-11 13:57                         ` James Bottomley
2005-07-13 19:56                           ` Stefan Richter
2005-07-13 20:12                             ` James Bottomley
2005-07-13 21:09                               ` Stefan Richter
2005-07-13 22:39                                 ` Stefan Richter
2005-07-10 19:26             ` Stefan Richter
2005-07-10  4:21     ` James Bottomley
2005-07-09 23:31   ` Ben Collins
2005-07-10  3:29     ` Jeff Garzik
2005-07-10  4:38       ` Ben Collins

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox