|
@@ -665,12 +665,19 @@ static void srp_path_rec_completion(int status,
|
|
|
static int srp_lookup_path(struct srp_rdma_ch *ch)
|
|
|
{
|
|
|
struct srp_target_port *target = ch->target;
|
|
|
- int ret;
|
|
|
+ int ret = -ENODEV;
|
|
|
|
|
|
ch->path.numb_path = 1;
|
|
|
|
|
|
init_completion(&ch->done);
|
|
|
|
|
|
+ /*
|
|
|
+ * Avoid that the SCSI host can be removed by srp_remove_target()
|
|
|
+ * before srp_path_rec_completion() is called.
|
|
|
+ */
|
|
|
+ if (!scsi_host_get(target->scsi_host))
|
|
|
+ goto out;
|
|
|
+
|
|
|
ch->path_query_id = ib_sa_path_rec_get(&srp_sa_client,
|
|
|
target->srp_host->srp_dev->dev,
|
|
|
target->srp_host->port,
|
|
@@ -684,18 +691,24 @@ static int srp_lookup_path(struct srp_rdma_ch *ch)
|
|
|
GFP_KERNEL,
|
|
|
srp_path_rec_completion,
|
|
|
ch, &ch->path_query);
|
|
|
- if (ch->path_query_id < 0)
|
|
|
- return ch->path_query_id;
|
|
|
+ ret = ch->path_query_id;
|
|
|
+ if (ret < 0)
|
|
|
+ goto put;
|
|
|
|
|
|
ret = wait_for_completion_interruptible(&ch->done);
|
|
|
if (ret < 0)
|
|
|
- return ret;
|
|
|
+ goto put;
|
|
|
|
|
|
- if (ch->status < 0)
|
|
|
+ ret = ch->status;
|
|
|
+ if (ret < 0)
|
|
|
shost_printk(KERN_WARNING, target->scsi_host,
|
|
|
PFX "Path record query failed\n");
|
|
|
|
|
|
- return ch->status;
|
|
|
+put:
|
|
|
+ scsi_host_put(target->scsi_host);
|
|
|
+
|
|
|
+out:
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
static int srp_send_req(struct srp_rdma_ch *ch, bool multich)
|