Commit 0c5b3952 authored by Ishai Rabinovitz's avatar Ishai Rabinovitz Committed by Roland Dreier

IB/srp: Clean up loop in srp_remove_one()

Interrupts will always be enabled in srp_remove_one(), so
spin_lock_irq() can be used instead of spin_lock_irqsave().
Also, the loop takes target->scsi_host->host_lock, so target->state
can just be set to SRP_TARGET_REMOVED witout testing the old value.
Signed-off-by: default avatarIshai Rabinovitz <ishai@mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 403a496f
...@@ -1850,7 +1850,6 @@ static void srp_remove_one(struct ib_device *device) ...@@ -1850,7 +1850,6 @@ static void srp_remove_one(struct ib_device *device)
struct srp_host *host, *tmp_host; struct srp_host *host, *tmp_host;
LIST_HEAD(target_list); LIST_HEAD(target_list);
struct srp_target_port *target, *tmp_target; struct srp_target_port *target, *tmp_target;
unsigned long flags;
srp_dev = ib_get_client_data(device, &srp_client); srp_dev = ib_get_client_data(device, &srp_client);
...@@ -1868,10 +1867,9 @@ static void srp_remove_one(struct ib_device *device) ...@@ -1868,10 +1867,9 @@ static void srp_remove_one(struct ib_device *device)
*/ */
spin_lock(&host->target_lock); spin_lock(&host->target_lock);
list_for_each_entry(target, &host->target_list, list) { list_for_each_entry(target, &host->target_list, list) {
spin_lock_irqsave(target->scsi_host->host_lock, flags); spin_lock_irq(target->scsi_host->host_lock);
if (target->state != SRP_TARGET_REMOVED) target->state = SRP_TARGET_REMOVED;
target->state = SRP_TARGET_REMOVED; spin_unlock_irq(target->scsi_host->host_lock);
spin_unlock_irqrestore(target->scsi_host->host_lock, flags);
} }
spin_unlock(&host->target_lock); spin_unlock(&host->target_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment