Commit 3ba1eeff authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: fnic: Kill 'exclude_id' argument to fnic_cleanup_io() 

'exclude_id' is always SCSI_NO_TAG which will never be reached when
traversing the list of tags.

Link: https://lore.kernel.org/r/20210429122517.39659-2-hare@suse.de


Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fc09acb7

drivers/scsi/fnic/fnic_scsi.c

+3 −6
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static const char *fnic_fcpio_status_to_str(unsigned int status) 
	return fcpio_status_str[status];

}



static void fnic_cleanup_io(struct fnic *fnic, int exclude_id);

static void fnic_cleanup_io(struct fnic *fnic);



static inline spinlock_t *fnic_io_lock_hash(struct fnic *fnic,

					    struct scsi_cmnd *sc)
@@ -638,7 +638,7 @@ static int fnic_fcpio_fw_reset_cmpl_handler(struct fnic *fnic, 
	atomic64_inc(&reset_stats->fw_reset_completions);



	/* Clean up all outstanding io requests */

	fnic_cleanup_io(fnic, SCSI_NO_TAG);

	fnic_cleanup_io(fnic);



	atomic64_set(&fnic->fnic_stats.fw_stats.active_fw_reqs, 0);

	atomic64_set(&fnic->fnic_stats.io_stats.active_ios, 0);
@@ -1361,7 +1361,7 @@ int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int copy_work_to_do) 
	return wq_work_done;

}



static void fnic_cleanup_io(struct fnic *fnic, int exclude_id)

static void fnic_cleanup_io(struct fnic *fnic)

{

	int i;

	struct fnic_io_req *io_req;
@@ -1372,9 +1372,6 @@ static void fnic_cleanup_io(struct fnic *fnic, int exclude_id) 
	struct fnic_stats *fnic_stats = &fnic->fnic_stats;



	for (i = 0; i < fnic->fnic_max_tag_id; i++) {

		if (i == exclude_id)

			continue;



		io_lock = fnic_io_lock_tag(fnic, i);

		spin_lock_irqsave(io_lock, flags);

		sc = scsi_host_find_tag(fnic->lport->host, i);