Message ID | 20250107153325.1689432-1-john.g.garry@oracle.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | scsi: scsi_debug: Constify sdebug_driver_template | expand |
On 1/7/25 7:33 AM, John Garry wrote: > It's better to have sdebug_driver_template as const, so update the probe > path to set the shost members directly after allocation and make that > change. The patch description does not explain why 'const' is better. Anyway: Reviewed-by: Bart Van Assche <bvanassche@acm.org>
John, > It's better to have sdebug_driver_template as const, so update the probe > path to set the shost members directly after allocation and make that > change. Applied to 6.14/scsi-staging, thanks!
On Tue, 07 Jan 2025 15:33:25 +0000, John Garry wrote: > It's better to have sdebug_driver_template as const, so update the probe > path to set the shost members directly after allocation and make that > change. > > Applied to 6.14/scsi-queue, thanks! [1/1] scsi: scsi_debug: Constify sdebug_driver_template https://git.kernel.org/mkp/scsi/c/37d061e1ace1
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index b4d425c2c1bd..435c13d72733 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -8707,7 +8707,7 @@ static int sdebug_init_cmd_priv(struct Scsi_Host *shost, struct scsi_cmnd *cmd) return 0; } -static struct scsi_host_template sdebug_driver_template = { +static const struct scsi_host_template sdebug_driver_template = { .show_info = scsi_debug_show_info, .write_info = scsi_debug_write_info, .proc_name = sdebug_proc_name, @@ -8750,17 +8750,17 @@ static int sdebug_driver_probe(struct device *dev) sdbg_host = dev_to_sdebug_host(dev); - sdebug_driver_template.can_queue = sdebug_max_queue; - sdebug_driver_template.cmd_per_lun = sdebug_max_queue; - if (!sdebug_clustering) - sdebug_driver_template.dma_boundary = PAGE_SIZE - 1; - hpnt = scsi_host_alloc(&sdebug_driver_template, 0); if (NULL == hpnt) { pr_err("scsi_host_alloc failed\n"); error = -ENODEV; return error; } + hpnt->can_queue = sdebug_max_queue; + hpnt->cmd_per_lun = sdebug_max_queue; + if (!sdebug_clustering) + hpnt->dma_boundary = PAGE_SIZE - 1; + if (submit_queues > nr_cpu_ids) { pr_warn("%s: trim submit_queues (was %d) to nr_cpu_ids=%u\n", my_name, submit_queues, nr_cpu_ids);
It's better to have sdebug_driver_template as const, so update the probe path to set the shost members directly after allocation and make that change. Signed-off-by: John Garry <john.g.garry@oracle.com>