Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Oct 2020 21:42:13 +0000 (14:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Oct 2020 21:42:13 +0000 (14:42 -0700)
Pull SCSI fixes from James Bottomley:
 "Two patches in driver frameworks. The iscsi one corrects a bug induced
  by a BPF change to network locking and the other is a regression we
  introduced"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: iscsi: iscsi_tcp: Avoid holding spinlock while calling getpeername()
  scsi: target: Fix lun lookup for TARGET_SCF_LOOKUP_LUN_FROM_TAG case

1  2 
drivers/target/target_core_transport.c

@@@ -1840,7 -1840,8 +1840,8 @@@ int target_submit_tmr(struct se_cmd *se
         * out unpacked_lun for the original se_cmd.
         */
        if (tm_type == TMR_ABORT_TASK && (flags & TARGET_SCF_LOOKUP_LUN_FROM_TAG)) {
-               if (!target_lookup_lun_from_tag(se_sess, tag, &unpacked_lun))
+               if (!target_lookup_lun_from_tag(se_sess, tag,
+                                               &se_cmd->orig_fe_lun))
                        goto failure;
        }
  
@@@ -2236,7 -2237,7 +2237,7 @@@ static void transport_complete_qf(struc
                        ret = cmd->se_tfo->queue_data_in(cmd);
                        break;
                }
 -              /* fall through */
 +              fallthrough;
        case DMA_NONE:
  queue_status:
                trace_target_cmd_complete(cmd);
@@@ -2431,7 -2432,7 +2432,7 @@@ queue_rsp
                                goto queue_full;
                        break;
                }
 -              /* fall through */
 +              fallthrough;
        case DMA_NONE:
  queue_status:
                trace_target_cmd_complete(cmd);