From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Apr 2021 00:22:10 +0000 (-0700)
Subject: Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d72cd4ad4174cfd2257c426ad51e4f53bcfde9c9;p=linux.git

Merge tag 'scsi-misc' of git://git./linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This consists of the usual driver updates (ufs, target, tcmu,
  smartpqi, lpfc, zfcp, qla2xxx, mpt3sas, pm80xx).

  The major core change is using a sbitmap instead of an atomic for
  queue tracking"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (412 commits)
  scsi: target: tcm_fc: Fix a kernel-doc header
  scsi: target: Shorten ALUA error messages
  scsi: target: Fix two format specifiers
  scsi: target: Compare explicitly with SAM_STAT_GOOD
  scsi: sd: Introduce a new local variable in sd_check_events()
  scsi: dc395x: Open-code status_byte(u8) calls
  scsi: 53c700: Open-code status_byte(u8) calls
  scsi: smartpqi: Remove unused functions
  scsi: qla4xxx: Remove an unused function
  scsi: myrs: Remove unused functions
  scsi: myrb: Remove unused functions
  scsi: mpt3sas: Fix two kernel-doc headers
  scsi: fcoe: Suppress a compiler warning
  scsi: libfc: Fix a format specifier
  scsi: aacraid: Remove an unused function
  scsi: core: Introduce enum scsi_disposition
  scsi: core: Modify the scsi_send_eh_cmnd() return value for the SDEV_BLOCK case
  scsi: core: Rename scsi_softirq_done() into scsi_complete()
  scsi: core: Remove an incorrect comment
  scsi: core: Make the scsi_alloc_sgtables() documentation more accurate
  ...
---

d72cd4ad4174cfd2257c426ad51e4f53bcfde9c9
diff --cc drivers/scsi/scsi_lib.c
index c289991ffaed2,d7c0d5a5f2636..532304d42f00e
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@@ -1747,9 -1813,30 +1775,29 @@@ static void scsi_mq_exit_request(struc
  
  	if (shost->hostt->exit_cmd_priv)
  		shost->hostt->exit_cmd_priv(shost, cmd);
 -	scsi_free_sense_buffer(cmd->flags & SCMD_UNCHECKED_ISA_DMA,
 -			       cmd->sense_buffer);
 +	kmem_cache_free(scsi_sense_cache, cmd->sense_buffer);
  }
  
+ 
+ static int scsi_mq_poll(struct blk_mq_hw_ctx *hctx)
+ {
+ 	struct Scsi_Host *shost = hctx->driver_data;
+ 
+ 	if (shost->hostt->mq_poll)
+ 		return shost->hostt->mq_poll(shost, hctx->queue_num);
+ 
+ 	return 0;
+ }
+ 
+ static int scsi_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
+ 			  unsigned int hctx_idx)
+ {
+ 	struct Scsi_Host *shost = data;
+ 
+ 	hctx->driver_data = shost;
+ 	return 0;
+ }
+ 
  static int scsi_map_queues(struct blk_mq_tag_set *set)
  {
  	struct Scsi_Host *shost = container_of(set, struct Scsi_Host, tag_set);
diff --cc include/scsi/scsi_host.h
index 8343c6f9fec19,3f3ebfdedeb2a..d0bf88d77f026
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@@ -611,7 -631,9 +626,8 @@@ struct Scsi_Host 
  	 * the total queue depth is can_queue.
  	 */
  	unsigned nr_hw_queues;
+ 	unsigned nr_maps;
  	unsigned active_mode:2;
 -	unsigned unchecked_isa_dma:1;
  
  	/*
  	 * Host has requested that no further requests come through for the