diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-30 06:43:43 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-30 06:43:43 -0400 |
| commit | bb41d2a51f0ed379cbe6b2f73271688784c40a1a (patch) | |
| tree | 8c414a77b6977e23fdefad009f72f97ae9d33e14 /drivers/scsi/libiscsi.c | |
| parent | 4bdb35506b89cbbd150c1baa284e7c191698241f (diff) | |
| parent | a909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff) | |
| download | linux-bb41d2a51f0ed379cbe6b2f73271688784c40a1a.tar.gz linux-bb41d2a51f0ed379cbe6b2f73271688784c40a1a.tar.bz2 linux-bb41d2a51f0ed379cbe6b2f73271688784c40a1a.zip | |
Merge 4.9-rc3 into driver-core-next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi/libiscsi.c')
| -rw-r--r-- | drivers/scsi/libiscsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index c051694bfcb0..f9b6fba689ff 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -791,9 +791,9 @@ __iscsi_conn_send_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr, free_task: /* regular RX path uses back_lock */ - spin_lock_bh(&session->back_lock); + spin_lock(&session->back_lock); __iscsi_put_task(task); - spin_unlock_bh(&session->back_lock); + spin_unlock(&session->back_lock); return NULL; } |