From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>,
Benjamin Block <bblock@linux.ibm.com>,
John Garry <john.g.garry@oracle.com>,
Ming Lei <ming.lei@redhat.com>, Christoph Hellwig <hch@lst.de>,
Hannes Reinecke <hare@suse.de>,
Mike Christie <michael.christie@oracle.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>
Subject: [PATCH v3 02/80] scsi: core: Declare most SCSI host template pointers const
Date: Wed, 22 Mar 2023 12:53:57 -0700 [thread overview]
Message-ID: <20230322195515.1267197-3-bvanassche@acm.org> (raw)
In-Reply-To: <20230322195515.1267197-1-bvanassche@acm.org>
Prepare for constifying most SCSI host template pointers by constifying
the SCSI host template pointer arguments and variables in the SCSI core.
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/scsi_error.c | 16 ++++++++--------
drivers/scsi/scsi_sysfs.c | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 2aa2c2aee6e7..3ec8bfd4090f 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -58,7 +58,7 @@
#define HOST_RESET_SETTLE_TIME (10)
static int scsi_eh_try_stu(struct scsi_cmnd *scmd);
-static enum scsi_disposition scsi_try_to_abort_cmd(struct scsi_host_template *,
+static enum scsi_disposition scsi_try_to_abort_cmd(const struct scsi_host_template *,
struct scsi_cmnd *);
void scsi_eh_wakeup(struct Scsi_Host *shost)
@@ -699,7 +699,7 @@ EXPORT_SYMBOL_GPL(scsi_check_sense);
static void scsi_handle_queue_ramp_up(struct scsi_device *sdev)
{
- struct scsi_host_template *sht = sdev->host->hostt;
+ const struct scsi_host_template *sht = sdev->host->hostt;
struct scsi_device *tmp_sdev;
if (!sht->track_queue_depth ||
@@ -731,7 +731,7 @@ static void scsi_handle_queue_ramp_up(struct scsi_device *sdev)
static void scsi_handle_queue_full(struct scsi_device *sdev)
{
- struct scsi_host_template *sht = sdev->host->hostt;
+ const struct scsi_host_template *sht = sdev->host->hostt;
struct scsi_device *tmp_sdev;
if (!sht->track_queue_depth)
@@ -840,7 +840,7 @@ static enum scsi_disposition scsi_try_host_reset(struct scsi_cmnd *scmd)
unsigned long flags;
enum scsi_disposition rtn;
struct Scsi_Host *host = scmd->device->host;
- struct scsi_host_template *hostt = host->hostt;
+ const struct scsi_host_template *hostt = host->hostt;
SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, host, "Snd Host RST\n"));
@@ -870,7 +870,7 @@ static enum scsi_disposition scsi_try_bus_reset(struct scsi_cmnd *scmd)
unsigned long flags;
enum scsi_disposition rtn;
struct Scsi_Host *host = scmd->device->host;
- struct scsi_host_template *hostt = host->hostt;
+ const struct scsi_host_template *hostt = host->hostt;
SCSI_LOG_ERROR_RECOVERY(3, scmd_printk(KERN_INFO, scmd,
"%s: Snd Bus RST\n", __func__));
@@ -912,7 +912,7 @@ static enum scsi_disposition scsi_try_target_reset(struct scsi_cmnd *scmd)
unsigned long flags;
enum scsi_disposition rtn;
struct Scsi_Host *host = scmd->device->host;
- struct scsi_host_template *hostt = host->hostt;
+ const struct scsi_host_template *hostt = host->hostt;
if (!hostt->eh_target_reset_handler)
return FAILED;
@@ -941,7 +941,7 @@ static enum scsi_disposition scsi_try_target_reset(struct scsi_cmnd *scmd)
static enum scsi_disposition scsi_try_bus_device_reset(struct scsi_cmnd *scmd)
{
enum scsi_disposition rtn;
- struct scsi_host_template *hostt = scmd->device->host->hostt;
+ const struct scsi_host_template *hostt = scmd->device->host->hostt;
if (!hostt->eh_device_reset_handler)
return FAILED;
@@ -970,7 +970,7 @@ static enum scsi_disposition scsi_try_bus_device_reset(struct scsi_cmnd *scmd)
* link down on FibreChannel)
*/
static enum scsi_disposition
-scsi_try_to_abort_cmd(struct scsi_host_template *hostt, struct scsi_cmnd *scmd)
+scsi_try_to_abort_cmd(const struct scsi_host_template *hostt, struct scsi_cmnd *scmd)
{
if (!hostt->eh_abort_handler)
return FAILED;
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index ee28f73af4d4..603e8fcfcb8a 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -296,7 +296,7 @@ store_host_reset(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
struct Scsi_Host *shost = class_to_shost(dev);
- struct scsi_host_template *sht = shost->hostt;
+ const struct scsi_host_template *sht = shost->hostt;
int ret = -EINVAL;
int type;
@@ -1025,7 +1025,7 @@ sdev_store_queue_depth(struct device *dev, struct device_attribute *attr,
{
int depth, retval;
struct scsi_device *sdev = to_scsi_device(dev);
- struct scsi_host_template *sht = sdev->host->hostt;
+ const struct scsi_host_template *sht = sdev->host->hostt;
if (!sht->change_queue_depth)
return -EINVAL;
@@ -1606,7 +1606,7 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev)
{
unsigned long flags;
struct Scsi_Host *shost = sdev->host;
- struct scsi_host_template *hostt = shost->hostt;
+ const struct scsi_host_template *hostt = shost->hostt;
struct scsi_target *starget = sdev->sdev_target;
device_initialize(&sdev->sdev_gendev);
next prev parent reply other threads:[~2023-03-22 19:55 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-22 19:53 [PATCH v3 00/80] Constify most SCSI host templates Bart Van Assche
2023-03-22 19:53 ` [PATCH v3 01/80] scsi: qla2xxx: Refer directly to the qla2xxx_driver_template Bart Van Assche
2023-03-22 19:53 ` Bart Van Assche [this message]
2023-03-22 19:53 ` [PATCH v3 03/80] scsi: core: Declare SCSI host template pointer members const Bart Van Assche
2023-03-22 19:53 ` [PATCH v3 04/80] ata: Declare SCSI host templates const Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 05/80] firewire: sbp2: Declare the SCSI host template const Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 06/80] RDMA/srp: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 07/80] scsi: message: fusion: Declare SCSI host template members const Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 08/80] scsi: zfcp: Declare SCSI host template const Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 09/80] scsi: 3w-9xxx: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 10/80] scsi: 3w-sas: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 11/80] scsi: 3w-xxxx: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 12/80] scsi: BusLogic: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 13/80] scsi: a100u2w: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 14/80] scsi: a2091: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 15/80] scsi: a3000: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 16/80] scsi: aacraid: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 17/80] scsi: advansys: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 18/80] scsi: aha152x: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 19/80] scsi: aha1542: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 20/80] scsi: aic94xx: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 21/80] scsi: arcmsr: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 22/80] scsi: acornscsi: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 23/80] scsi: arxescsi: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 24/80] scsi: aha1740: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 25/80] scsi: cumana: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 26/80] scsi: eesox: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 27/80] scsi: oak: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 28/80] scsi: powertec: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 29/80] scsi: atp870u: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 30/80] scsi: dc395x: " Bart Van Assche
2023-03-23 8:43 ` Oliver Neukum
2023-03-22 19:54 ` [PATCH v3 31/80] scsi: dmx3191d: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 32/80] scsi: elx: efct: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 33/80] scsi: esas2r: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 34/80] scsi: esp_scsi: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 35/80] scsi: fcoe: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 36/80] scsi: fnic: Declare " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 37/80] scsi: qedf: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 38/80] scsi: fdomain: Declare SCSI " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 39/80] scsi: NCR5380: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 40/80] scsi: gvp11: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 41/80] scsi: hisi_sas: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 42/80] scsi: hpsa: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 43/80] scsi: hptiop: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 44/80] scsi: ibmvfc: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 45/80] scsi: imm: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 46/80] scsi: initio: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 47/80] scsi: ipr: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 48/80] scsi: isci: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 49/80] scsi: iscsi: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 50/80] scsi: mac53c94: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 51/80] scsi: megaraid: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 52/80] scsi: mesh: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 53/80] scsi: mpi3mr: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 54/80] scsi: mpt3sas: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 55/80] scsi: mvme147: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 56/80] scsi: mvsas: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 57/80] scsi: mvumi: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 58/80] scsi: myrb: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 59/80] scsi: myrs: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 60/80] scsi: nsp32: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 61/80] scsi: pcmcia-sym53c500: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 62/80] scsi: pcmcia-pm8001: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 63/80] scsi: pmcraid: " Bart Van Assche
2023-03-22 19:54 ` [PATCH v3 64/80] scsi: ppa: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 65/80] scsi: ps3rom: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 66/80] scsi: qla1280: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 67/80] scsi: qla2xxx: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 68/80] scsi: qlogicpti: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 69/80] scsi: sgiwd93: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 70/80] scsi: smartpqi: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 71/80] scsi: snic: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 72/80] scsi: stex: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 73/80] scsi: sym53c8xx: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 74/80] scsi: virtio-scsi: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 75/80] scsi: wd719x: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 76/80] scsi: xen-scsifront: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 77/80] scsi: rts5208: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 78/80] scsi: target: tcm-loop: " Bart Van Assche
2023-03-22 19:55 ` [PATCH v3 79/80] scsi: ufs: " Bart Van Assche
2024-01-04 9:52 ` Peter Wang (王信友)
2024-01-08 17:48 ` Bart Van Assche
2024-01-09 13:04 ` Peter Wang (王信友)
2023-03-22 19:55 ` [PATCH v3 80/80] usb: uas: Declare two host templates and host template pointers const Bart Van Assche
2023-03-25 0:14 ` [PATCH v3 00/80] Constify most SCSI host templates Martin K. Petersen
2023-04-03 2:15 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230322195515.1267197-3-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=bblock@linux.ibm.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=john.g.garry@oracle.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=michael.christie@oracle.com \
--cc=ming.lei@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).