From: Bart Van Assche <bvanassche@acm.org>
To: Steffen Maier <maier@linux.ibm.com>,
jwi@linux.ibm.com, martin.petersen@oracle.com,
jejb@linux.ibm.com, linux-scsi@vger.kernel.org
Cc: gregkh@linuxfoundation.org, bblock@linux.ibm.com,
linux-next@vger.kernel.org, linux-s390@vger.kernel.org
Subject: Re: [PATCH v3] scsi: core: Fix early registration of sysfs attributes for scsi_device
Date: Tue, 26 Oct 2021 11:31:28 -0700 [thread overview]
Message-ID: <9a2535ec-7380-f948-d132-763d3d2140c5@acm.org> (raw)
In-Reply-To: <20211026014240.4098365-1-maier@linux.ibm.com>
On 10/25/21 6:42 PM, Steffen Maier wrote:
> diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
> index c26f0e29e8cd..fa064bf9a55c 100644
> --- a/drivers/scsi/scsi_sysfs.c
> +++ b/drivers/scsi/scsi_sysfs.c
> @@ -1571,7 +1571,6 @@ static struct device_type scsi_dev_type = {
>
> void scsi_sysfs_device_initialize(struct scsi_device *sdev)
> {
> - int i, j = 0;
> unsigned long flags;
> struct Scsi_Host *shost = sdev->host;
> struct scsi_host_template *hostt = shost->hostt;
> @@ -1583,15 +1582,7 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev)
> scsi_enable_async_suspend(&sdev->sdev_gendev);
> dev_set_name(&sdev->sdev_gendev, "%d:%d:%d:%llu",
> sdev->host->host_no, sdev->channel, sdev->id, sdev->lun);
> - sdev->gendev_attr_groups[j++] = &scsi_sdev_attr_group;
> - if (hostt->sdev_groups) {
> - for (i = 0; hostt->sdev_groups[i] &&
> - j < ARRAY_SIZE(sdev->gendev_attr_groups);
> - i++, j++) {
> - sdev->gendev_attr_groups[j] = hostt->sdev_groups[i];
> - }
> - }
> - WARN_ON_ONCE(j >= ARRAY_SIZE(sdev->gendev_attr_groups));
> + sdev->sdev_gendev.groups = hostt->sdev_groups;
>
> device_initialize(&sdev->sdev_dev);
> sdev->sdev_dev.parent = get_device(&sdev->sdev_gendev);
> diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
> index b1e9b3bd3a60..b97e142a7ca9 100644
> --- a/include/scsi/scsi_device.h
> +++ b/include/scsi/scsi_device.h
> @@ -225,12 +225,6 @@ struct scsi_device {
>
> struct device sdev_gendev,
> sdev_dev;
> - /*
> - * The array size 6 provides space for one attribute group for the
> - * SCSI core, four attribute groups defined by SCSI LLDs and one
> - * terminating NULL pointer.
> - */
> - const struct attribute_group *gendev_attr_groups[6];
>
> struct execute_work ew; /* used to get process context on put */
> struct work_struct requeue_work;
Thanks!
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
next prev parent reply other threads:[~2021-10-26 18:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20211012233558.4066756-1-bvanassche@acm.org>
[not found] ` <163478764102.7011.9375895285870786953.b4-ty@oracle.com>
2021-10-23 20:54 ` Missing driver-specific sysfs attributes of scsi_device [was: Re: [PATCH v4 00/46] Register SCSI sysfs attributes earlier] Steffen Maier
2021-10-24 0:39 ` Steffen Maier
2021-10-24 2:55 ` Bart Van Assche
2021-10-24 11:18 ` [PATCH] scsi: core: Fix early registration of sysfs attributes for scsi_device Steffen Maier
2021-10-24 21:25 ` Bart Van Assche
2021-10-24 22:16 ` [PATCH v2] " Steffen Maier
2021-10-25 9:23 ` Julian Wiedmann
2021-10-25 16:00 ` Bart Van Assche
2021-10-26 1:42 ` [PATCH v3] " Steffen Maier
2021-10-26 10:00 ` Benjamin Block
2021-10-26 21:48 ` Bart Van Assche
2021-10-29 17:55 ` Benjamin Block
2021-10-26 18:31 ` Bart Van Assche [this message]
2021-10-29 17:56 ` Benjamin Block
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=9a2535ec-7380-f948-d132-763d3d2140c5@acm.org \
--to=bvanassche@acm.org \
--cc=bblock@linux.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=jejb@linux.ibm.com \
--cc=jwi@linux.ibm.com \
--cc=linux-next@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=maier@linux.ibm.com \
--cc=martin.petersen@oracle.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).