diff options
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index 75223f50de58..0ba6ec876296 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.c +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c | |||
@@ -257,11 +257,8 @@ static void iscsi_iser_cleanup_task(struct iscsi_task *task) | |||
257 | { | 257 | { |
258 | struct iscsi_iser_task *iser_task = task->dd_data; | 258 | struct iscsi_iser_task *iser_task = task->dd_data; |
259 | 259 | ||
260 | /* | 260 | /* mgmt tasks do not need special cleanup */ |
261 | * mgmt tasks do not need special cleanup and we do not | 261 | if (!task->sc) |
262 | * allocate anything in the init task callout | ||
263 | */ | ||
264 | if (!task->sc || task->state == ISCSI_TASK_PENDING) | ||
265 | return; | 262 | return; |
266 | 263 | ||
267 | if (iser_task->status == ISER_TASK_STATUS_STARTED) { | 264 | if (iser_task->status == ISER_TASK_STATUS_STARTED) { |
@@ -517,7 +514,8 @@ iscsi_iser_conn_get_stats(struct iscsi_cls_conn *cls_conn, struct iscsi_stats *s | |||
517 | } | 514 | } |
518 | 515 | ||
519 | static struct iscsi_endpoint * | 516 | static struct iscsi_endpoint * |
520 | iscsi_iser_ep_connect(struct sockaddr *dst_addr, int non_blocking) | 517 | iscsi_iser_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr, |
518 | int non_blocking) | ||
521 | { | 519 | { |
522 | int err; | 520 | int err; |
523 | struct iser_conn *ib_conn; | 521 | struct iser_conn *ib_conn; |