Bläddra i källkod

ieee1394: sbp2: slightly reorder sbp2scsi_abort

Put the target's fetch agent into reset state before the underlying ORB
DMA is unmapped and the ->done handler is called.  It is highly unlikely
but the target could access that ORB right before sbp2 sends the reset
request.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Stefan Richter 19 år sedan
förälder
incheckning
23077f1d72
1 ändrade filer med 2 tillägg och 8 borttagningar
  1. 2 8
      drivers/ieee1394/sbp2.c

+ 2 - 8
drivers/ieee1394/sbp2.c

@@ -2564,11 +2564,9 @@ static int sbp2scsi_abort(struct scsi_cmnd *SCpnt)
 	scsi_print_command(SCpnt);
 	scsi_print_command(SCpnt);
 
 
 	if (sbp2util_node_is_available(scsi_id)) {
 	if (sbp2util_node_is_available(scsi_id)) {
+		sbp2_agent_reset(scsi_id, 1);
 
 
-		/*
-		 * Right now, just return any matching command structures
-		 * to the free pool.
-		 */
+		/* Return a matching command structure to the free pool. */
 		spin_lock_irqsave(&scsi_id->sbp2_command_orb_lock, flags);
 		spin_lock_irqsave(&scsi_id->sbp2_command_orb_lock, flags);
 		command = sbp2util_find_command_for_SCpnt(scsi_id, SCpnt);
 		command = sbp2util_find_command_for_SCpnt(scsi_id, SCpnt);
 		if (command) {
 		if (command) {
@@ -2589,10 +2587,6 @@ static int sbp2scsi_abort(struct scsi_cmnd *SCpnt)
 		}
 		}
 		spin_unlock_irqrestore(&scsi_id->sbp2_command_orb_lock, flags);
 		spin_unlock_irqrestore(&scsi_id->sbp2_command_orb_lock, flags);
 
 
-		/*
-		 * Initiate a fetch agent reset.
-		 */
-		sbp2_agent_reset(scsi_id, 1);
 		sbp2scsi_complete_all_commands(scsi_id, DID_BUS_BUSY);
 		sbp2scsi_complete_all_commands(scsi_id, DID_BUS_BUSY);
 	}
 	}