| Message ID | 20240219-device_cleanup-scsi-v1-1-c5edf2afe178@marliere.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: constify the struct device_type usage | expand |
Ricardo, > Since commit aed65af1cc2f ("drivers: make device_type const"), the > driver core can properly handle constant struct device_type. Move the > scsi_host_type, scsi_target_type and scsi_dev_type variables to be > constant structures as well, placing it into read-only memory which > can not be modified at runtime. Applied to 6.9/scsi-staging, thanks!
On Mon, 19 Feb 2024 08:45:53 -0300, Ricardo B. Marliere wrote: > Since commit aed65af1cc2f ("drivers: make device_type const"), the driver > core can properly handle constant struct device_type. Move the > scsi_host_type, scsi_target_type and scsi_dev_type variables to be constant > structures as well, placing it into read-only memory which can not be > modified at runtime. > > > [...] Applied to 6.9/scsi-queue, thanks! [1/1] scsi: constify the struct device_type usage https://git.kernel.org/mkp/scsi/c/517bcc2b4db4
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index d7f51b84f3c7..4f495a41ec4a 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -371,7 +371,7 @@ static void scsi_host_dev_release(struct device *dev) kfree(shost); } -static struct device_type scsi_host_type = { +static const struct device_type scsi_host_type = { .name = "scsi_host", .release = scsi_host_dev_release, }; diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 70c0319be34c..44c1956b1720 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -412,7 +412,7 @@ static void scsi_target_dev_release(struct device *dev) put_device(parent); } -static struct device_type scsi_target_type = { +static const struct device_type scsi_target_type = { .name = "scsi_target", .release = scsi_target_dev_release, }; diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 14d0be0da0c6..49dd34426d5e 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -27,7 +27,7 @@ #include "scsi_priv.h" #include "scsi_logging.h" -static struct device_type scsi_dev_type; +static const struct device_type scsi_dev_type; static const struct { enum scsi_device_state value; @@ -1626,7 +1626,7 @@ int scsi_sysfs_add_host(struct Scsi_Host *shost) return 0; } -static struct device_type scsi_dev_type = { +static const struct device_type scsi_dev_type = { .name = "scsi_device", .release = scsi_device_dev_release, .groups = scsi_sdev_attr_groups,
Since commit aed65af1cc2f ("drivers: make device_type const"), the driver core can properly handle constant struct device_type. Move the scsi_host_type, scsi_target_type and scsi_dev_type variables to be constant structures as well, placing it into read-only memory which can not be modified at runtime. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ricardo B. Marliere <ricardo@marliere.net> --- drivers/scsi/hosts.c | 2 +- drivers/scsi/scsi_scan.c | 2 +- drivers/scsi/scsi_sysfs.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) --- base-commit: 9f3dbcb5632d6876226031d552ef6163bb3ad215 change-id: 20240219-device_cleanup-scsi-bcbc0c15c5e0 Best regards,