diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-27 10:08:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-27 10:08:58 -0700 |
| commit | 18c2152d526e7956457fcdcbdf6d77ae2c663a26 (patch) | |
| tree | f936cf832425bc008e348fbe2491447a683b238a /drivers/scsi/libiscsi.c | |
| parent | 4a3c390c384f31c60aaf0502dcd3d790a9ebebca (diff) | |
| parent | 602432c150251f20fb4a41a5a6463b91e3d19053 (diff) | |
| download | linux-18c2152d526e7956457fcdcbdf6d77ae2c663a26.tar.gz linux-18c2152d526e7956457fcdcbdf6d77ae2c663a26.tar.bz2 linux-18c2152d526e7956457fcdcbdf6d77ae2c663a26.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two small fixes: one is a fatal section mismatch (reference to init
after it's discarded) and the other two are iscsi locking fixes"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: NCR5380: no longer mark irq probing as __init
scsi: be2iscsi: Replace _bh with _irqsave/irqrestore
scsi: libiscsi: Fix locking in __iscsi_conn_send_pdu
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; } |