aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-03 15:07:49 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-03 15:07:49 -0500
commit304b46996ca1a989fe0fe99831ed38c79e855245 (patch)
tree754de5e46077e2755c5e250bf618f6f1e0cad0b6
parentecb77fa96ceda9cae88015bfe3293ffe19006159 (diff)
parentb0e47c8b79154772a436f25bf7646733e1d6194c (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/srp: Fix list corruption/oops on module reload
-rw-r--r--drivers/infiniband/ulp/srp/ib_srp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 950228fb009f..77e8b90dfbff 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -2054,6 +2054,7 @@ static void srp_remove_one(struct ib_device *device)
2054 list_for_each_entry_safe(target, tmp_target, 2054 list_for_each_entry_safe(target, tmp_target,
2055 &host->target_list, list) { 2055 &host->target_list, list) {
2056 scsi_remove_host(target->scsi_host); 2056 scsi_remove_host(target->scsi_host);
2057 srp_remove_host(target->scsi_host);
2057 srp_disconnect_target(target); 2058 srp_disconnect_target(target);
2058 ib_destroy_cm_id(target->cm_id); 2059 ib_destroy_cm_id(target->cm_id);
2059 srp_free_target_ib(target); 2060 srp_free_target_ib(target);