[10/10] scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL

Message ID	20231023092837.33786-11-hare@suse.de
State	New
Headers	show Return-Path: <linux-scsi-owner@vger.kernel.org> From: Hannes Reinecke <hare@suse.de> To: "Martin K. Petersen" <martin.petersen@oracle.com> Cc: Christoph Hellwig <hch@lst.de>, James Bottomley <james.bottomley@hansenpartnership.com>, linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>, Bart Van Assche <bvanassche@acm.org>, Johannes Thumshirn <johannes.thumshirn@wdc.com> Subject: [PATCH 10/10] scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL Date: Mon, 23 Oct 2023 11:28:37 +0200 Message-Id: <20231023092837.33786-11-hare@suse.de> In-Reply-To: <20231023092837.33786-1-hare@suse.de> References: <20231023092837.33786-1-hare@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	scsi: EH rework, main part \| expand [PATCHv8,00/10] scsi: EH rework, main part [01/10] scsi: Use Scsi_Host as argument for eh_host_reset_handler [02/10] scsi: Use Scsi_Host and channel number as argument for eh_bus_reset_handler() [03/10] scsi: Use scsi_target as argument for eh_target_reset_handler() [04/10] scsi: Use scsi_device as argument to eh_device_reset_handler() [05/10] scsi: set host byte after EH completed [06/10] scsi_error: iterate over list of failed commands in scsi_eh_bus_reset() [07/10] scsi: Do not allocate scsi command in scsi_ioctl_reset() [08/10] scsi_error: iterate over list of failed commands in scsi_eh_bus_device_reset() [09/10] scsi_error: map FAST_IO_FAIL to -EAGAIN in SCSI EH [10/10] scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL

Message ID

20231023092837.33786-11-hare@suse.de

State

New

Headers

From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
        James Bottomley <james.bottomley@hansenpartnership.com>,
        linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>,
        Bart Van Assche <bvanassche@acm.org>,
        Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH 10/10] scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL
Date: Mon, 23 Oct 2023 11:28:37 +0200
Message-Id: <20231023092837.33786-11-hare@suse.de>
In-Reply-To: <20231023092837.33786-1-hare@suse.de>
References: <20231023092837.33786-1-hare@suse.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

scsi: EH rework, main part | expand

Commit Message

Hannes Reinecke Oct. 23, 2023, 9:28 a.m. UTC

Unused now.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
 drivers/scsi/scsi_lib.c  | 2 --
 include/scsi/scsi_cmnd.h | 1 -
 2 files changed, 3 deletions(-)

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index aca57c3ab626..d38734298b2c 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1616,8 +1616,6 @@  static void scsi_done_internal(struct scsi_cmnd *cmd, bool complete_directly)
 		break;
 	case SUBMITTED_BY_SCSI_ERROR_HANDLER:
 		return scsi_eh_done(cmd);
-	case SUBMITTED_BY_SCSI_RESET_IOCTL:
-		return;
 	}
 
 	if (unlikely(blk_should_fake_timeout(scsi_cmd_to_rq(cmd)->q)))
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 526def14e7fb..d681510724aa 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -68,7 +68,6 @@  struct scsi_pointer {
 enum scsi_cmnd_submitter {
 	SUBMITTED_BY_BLOCK_LAYER = 0,
 	SUBMITTED_BY_SCSI_ERROR_HANDLER = 1,
-	SUBMITTED_BY_SCSI_RESET_IOCTL = 2,
 } __packed;
 
 struct scsi_cmnd {

[10/10] scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL

Commit Message

Patch