Thread (11 messages) 11 messages, 5 authors, 2021-06-16

Re: [PATCH v3 3/3] Change the type of the second argument of scsi_host_complete_all_commands()

From: Himanshu Madhani <hidden>
Date: 2021-05-24 15:27:26


On 5/23/21 9:54 PM, Bart Van Assche wrote:
quoted hunk ↗ jump to hunk
Allow the compiler to verify the type of the second argument passed to
scsi_host_complete_all_commands().

Cc: Hannes Reinecke <hare@suse.com>
Cc: John Garry <redacted>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
  drivers/scsi/hosts.c     | 8 +++++---
  include/scsi/scsi_host.h | 2 +-
  2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 624e2582c3df..1387a56981f7 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -655,10 +655,11 @@ EXPORT_SYMBOL_GPL(scsi_flush_work);
  static bool complete_all_cmds_iter(struct request *rq, void *data, bool rsvd)
  {
  	struct scsi_cmnd *scmd = blk_mq_rq_to_pdu(rq);
-	int status = *(int *)data;
+	enum scsi_host_status status = *(enum scsi_host_status *)data;
  
  	scsi_dma_unmap(scmd);
-	scmd->result = status << 16;
+	scmd->result = 0;
+	set_host_byte(scmd, status);
  	scmd->scsi_done(scmd);
  	return true;
  }
@@ -673,7 +674,8 @@ static bool complete_all_cmds_iter(struct request *rq, void *data, bool rsvd)
   * caller to ensure that concurrent I/O submission and/or
   * completion is stopped when calling this function.
   */
-void scsi_host_complete_all_commands(struct Scsi_Host *shost, int status)
+void scsi_host_complete_all_commands(struct Scsi_Host *shost,
+				     enum scsi_host_status status)
  {
  	blk_mq_tagset_busy_iter(&shost->tag_set, complete_all_cmds_iter,
  				&status);
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index d0bf88d77f02..75363707b73f 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -764,7 +764,7 @@ extern void scsi_host_put(struct Scsi_Host *t);
  extern struct Scsi_Host *scsi_host_lookup(unsigned short);
  extern const char *scsi_host_state_name(enum scsi_host_state);
  extern void scsi_host_complete_all_commands(struct Scsi_Host *shost,
-					    int status);
+					    enum scsi_host_status status);
  
  static inline int __must_check scsi_add_host(struct Scsi_Host *host,
  					     struct device *dev)
Reviewed-by: Himanshu Madhani <redacted>

-- 
Himanshu Madhani                                Oracle Linux Engineering
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help