diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2020-03-04 13:11:06 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2020-03-04 13:11:06 -0400 |
| commit | c13cac2a21b44c6d18a2cf5485f26eee0fb686f6 (patch) | |
| tree | 1cf120a57dbbc95a2d450f1c2047e89b9f917596 /drivers/infiniband/ulp | |
| parent | bb8865f435d81223596f1abd6dec0b12ed122af0 (diff) | |
| parent | 98d54f81e36ba3bf92172791eba5ca5bd813989b (diff) | |
| download | linux-c13cac2a21b44c6d18a2cf5485f26eee0fb686f6.tar.gz linux-c13cac2a21b44c6d18a2cf5485f26eee0fb686f6.tar.bz2 linux-c13cac2a21b44c6d18a2cf5485f26eee0fb686f6.zip | |
Merge tag 'v5.6-rc4' into rdma.git for-next
Required due to dependencies in following patches.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/infiniband/ulp')
| -rw-r--r-- | drivers/infiniband/ulp/isert/ib_isert.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c index b273e421e910..a1a035270cab 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.c +++ b/drivers/infiniband/ulp/isert/ib_isert.c @@ -2575,6 +2575,17 @@ isert_wait4logout(struct isert_conn *isert_conn) } } +static void +isert_wait4cmds(struct iscsi_conn *conn) +{ + isert_info("iscsi_conn %p\n", conn); + + if (conn->sess) { + target_sess_cmd_list_set_waiting(conn->sess->se_sess); + target_wait_for_sess_cmds(conn->sess->se_sess); + } +} + /** * isert_put_unsol_pending_cmds() - Drop commands waiting for * unsolicitate dataout @@ -2622,6 +2633,7 @@ static void isert_wait_conn(struct iscsi_conn *conn) ib_drain_qp(isert_conn->qp); isert_put_unsol_pending_cmds(conn); + isert_wait4cmds(conn); isert_wait4logout(isert_conn); queue_work(isert_release_wq, &isert_conn->release_work); |