From: Christoph Hellwig <hch@lst.de>
To: Dan Williams <dan.j.williams@intel.com>, Jens Axboe <axboe@kernel.dk>
Cc: Vishal Verma <vishal.l.verma@intel.com>,
Dave Jiang <dave.jiang@intel.com>,
Ira Weiny <ira.weiny@intel.com>,
linux-block@vger.kernel.org, nvdimm@lists.linux.dev
Subject: [PATCH 3/3] block: warn if ->groups is set when calling add_disk
Date: Mon, 20 Sep 2021 09:27:26 +0200 [thread overview]
Message-ID: <20210920072726.1159572-4-hch@lst.de> (raw)
In-Reply-To: <20210920072726.1159572-1-hch@lst.de>
The proper API is to pass the groups to device_add_disk, but the code
used to also allow groups being set before calling *add_disk. Warn
about that but keep the group pointer intact for now so that it can
be removed again after a grace period.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Fixes: 52b85909f85d ("block: fold register_disk into device_add_disk")
---
block/genhd.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/block/genhd.c b/block/genhd.c
index 7b6e5e1cf9564..409cf608cc5bd 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -439,7 +439,8 @@ int device_add_disk(struct device *parent, struct gendisk *disk,
dev_set_uevent_suppress(ddev, 1);
ddev->parent = parent;
- ddev->groups = groups;
+ if (!WARN_ON_ONCE(ddev->groups))
+ ddev->groups = groups;
dev_set_name(ddev, "%s", disk->disk_name);
if (!(disk->flags & GENHD_FL_HIDDEN))
ddev->devt = MKDEV(disk->major, disk->first_minor);
--
2.30.2
next prev parent reply other threads:[~2021-09-20 7:29 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 7:27 fix a dax/block device attribute registration regression Christoph Hellwig
2021-09-20 7:27 ` [PATCH 1/3] nvdimm/pmem: fix creating the dax group Christoph Hellwig
2021-09-20 22:52 ` Ira Weiny
2021-09-20 23:09 ` Dan Williams
2021-09-20 23:09 ` Dan Williams
2021-09-20 7:27 ` [PATCH 2/3] nvdimm/pmem: move dax_attribute_group from dax to pmem Christoph Hellwig
2021-09-20 18:00 ` kernel test robot
2021-09-20 18:00 ` kernel test robot
2021-09-20 23:29 ` Dan Williams
2021-09-20 23:29 ` Dan Williams
2021-09-20 23:29 ` Dan Williams
2021-09-20 22:51 ` Ira Weiny
2021-09-20 23:36 ` Dan Williams
2021-09-20 23:36 ` Dan Williams
2021-09-20 23:37 ` Dan Williams
2021-09-20 23:37 ` Dan Williams
2021-09-20 7:27 ` Christoph Hellwig [this message]
2021-09-20 22:52 ` [PATCH 3/3] block: warn if ->groups is set when calling add_disk Ira Weiny
2021-09-20 23:50 ` Dan Williams
2021-09-20 23:50 ` Dan Williams
2021-09-21 6:32 ` Christoph Hellwig
2021-09-22 17:34 dax_supported() related cleanups v2 Christoph Hellwig
2021-09-22 17:34 ` [PATCH 3/3] block: warn if ->groups is set when calling add_disk Christoph Hellwig
2021-09-22 18:33 fix a dax/block device attribute registration regression Christoph Hellwig
2021-09-22 18:33 ` [PATCH 3/3] block: warn if ->groups is set when calling add_disk Christoph Hellwig
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=20210920072726.1159572-4-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=ira.weiny@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=vishal.l.verma@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.