---

yaml --- r: 302583 b: refs/heads/master c: 3ef768c h: refs/heads/master i: 302581: f44ad8a 302579: 72aca41 302575: 51d8bc3 v: v3
git-mirror · May 17, 2012 · 776e929 · 776e929
1 parent 9ba3ea8
commit 776e929
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8381807ebdfffa34c2c5aa38eda33673d1a7adf
+refs/heads/master: 3ef768c6c0caa83b9fe66f19a18898ed0315ac36
diff --git a/trunk/drivers/scsi/isci/remote_device.c b/trunk/drivers/scsi/isci/remote_device.c
@@ -243,8 +243,11 @@ enum sci_status isci_remote_device_terminate_requests(
 					 idev->rnc.destination_state,
 					 ireq, ireq->flags);
 			}
+			spin_lock_irqsave(&ihost->scic_lock, flags);
 			clear_bit(IREQ_NO_AUTO_FREE_TAG, &ireq->flags);
-			isci_free_tag(ihost, ireq->io_tag);
+			if (!test_bit(IREQ_ABORT_PATH_ACTIVE, &ireq->flags))
+				isci_free_tag(ihost, ireq->io_tag);
+			spin_unlock_irqrestore(&ihost->scic_lock, flags);
 		} else {
 			/* Terminate all TCs. */
 			sci_remote_device_terminate_requests(idev);