diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-03-04 12:02:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-04 12:02:55 +1000 |
| commit | 2c3cd66f4c66b169c18a2dbebbc894681d282278 (patch) | |
| tree | 9d2e055ea43e177914a4cce9d007982a7417623c /drivers/scsi/libiscsi.c | |
| parent | 7fbd5d784f75750199c21918da9b2fc92af371e6 (diff) | |
| parent | 1c163f4c7b3f621efff9b28a47abb36f7378d783 (diff) | |
| download | linux-2c3cd66f4c66b169c18a2dbebbc894681d282278.tar.gz | |
Merge v5.0 into drm-next
There is a really hairy resolution involving amdgpu fixes, that I'd rather confirm here.
Also some misc fixes are landed by me, but the pr has them as well.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/scsi/libiscsi.c')
| -rw-r--r-- | drivers/scsi/libiscsi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index b8d325ce8754..120fc520f27a 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -1459,7 +1459,13 @@ static int iscsi_xmit_task(struct iscsi_conn *conn) if (test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx)) return -ENODATA; + spin_lock_bh(&conn->session->back_lock); + if (conn->task == NULL) { + spin_unlock_bh(&conn->session->back_lock); + return -ENODATA; + } __iscsi_get_task(task); + spin_unlock_bh(&conn->session->back_lock); spin_unlock_bh(&conn->session->frwd_lock); rc = conn->session->tt->xmit_task(task); spin_lock_bh(&conn->session->frwd_lock); |