---

yaml --- r: 27611 b: refs/heads/master c: 0c5b395 h: refs/heads/master i: 27609: 5a1f0b7 27607: a4cbf0b v: v3
git-mirror · Jun 18, 2006 · bbce1df · bbce1df
1 parent 9db5364
commit bbce1df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 403a496fd4af3036c12e1f9c90a89cf846fadd35
+refs/heads/master: 0c5b395239cdea4db3d9c23a5738fdaf3b9ada4c
diff --git a/trunk/drivers/infiniband/ulp/srp/ib_srp.c b/trunk/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1850,7 +1850,6 @@ static void srp_remove_one(struct ib_device *device)
 	struct srp_host *host, *tmp_host;
 	LIST_HEAD(target_list);
 	struct srp_target_port *target, *tmp_target;
-	unsigned long flags;
 
 	srp_dev = ib_get_client_data(device, &srp_client);
 
@@ -1868,10 +1867,9 @@ static void srp_remove_one(struct ib_device *device)
 		 */
 		spin_lock(&host->target_lock);
 		list_for_each_entry(target, &host->target_list, list) {
-			spin_lock_irqsave(target->scsi_host->host_lock, flags);
-			if (target->state != SRP_TARGET_REMOVED)
-				target->state = SRP_TARGET_REMOVED;
-			spin_unlock_irqrestore(target->scsi_host->host_lock, flags);
+			spin_lock_irq(target->scsi_host->host_lock);
+			target->state = SRP_TARGET_REMOVED;
+			spin_unlock_irq(target->scsi_host->host_lock);
 		}
 		spin_unlock(&host->target_lock);