From: Dan Williams <dan.j.williams@intel.com>
To: axboe@fb.com
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, hch@lst.de
Subject: [PATCH 1/3] block: introduce device_add_disk()
Date: Thu, 25 Feb 2016 12:04:43 -0800 [thread overview]
Message-ID: <20160225200443.21975.77561.stgit@dwillia2-desk3.amr.corp.intel.com> (raw)
In-Reply-To: <20160225200018.21975.30922.stgit@dwillia2-desk3.amr.corp.intel.com>
In preparation for removing the ->driverfs_dev member of a gendisk, add
an api that takes the parent device as a parameter to add_disk().
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
block/genhd.c | 22 ++++++++++------------
include/linux/genhd.h | 8 +++++++-
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/block/genhd.c b/block/genhd.c
index eb05dfc1dffe..3fa2654ada52 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -506,7 +506,7 @@ static int exact_lock(dev_t devt, void *data)
return 0;
}
-static void register_disk(struct gendisk *disk)
+static void register_disk(struct device *parent, struct gendisk *disk)
{
struct device *ddev = disk_to_dev(disk);
struct block_device *bdev;
@@ -514,7 +514,7 @@ static void register_disk(struct gendisk *disk)
struct hd_struct *part;
int err;
- ddev->parent = disk->driverfs_dev;
+ ddev->parent = parent;
dev_set_name(ddev, "%s", disk->disk_name);
@@ -573,7 +573,8 @@ exit:
}
/**
- * add_disk - add partitioning information to kernel list
+ * device_add_disk - add partitioning information to kernel list
+ * @parent: parent device for the disk
* @disk: per-device partitioning information
*
* This function registers the partitioning information in @disk
@@ -581,7 +582,7 @@ exit:
*
* FIXME: error handling
*/
-void add_disk(struct gendisk *disk)
+int device_add_disk(struct device *parent, struct gendisk *disk)
{
struct backing_dev_info *bdi;
dev_t devt;
@@ -597,10 +598,8 @@ void add_disk(struct gendisk *disk)
disk->flags |= GENHD_FL_UP;
retval = blk_alloc_devt(&disk->part0, &devt);
- if (retval) {
- WARN_ON(1);
- return;
- }
+ if (retval)
+ return retval;
disk_to_dev(disk)->devt = devt;
/* ->major and ->first_minor aren't supposed to be
@@ -617,7 +616,7 @@ void add_disk(struct gendisk *disk)
blk_register_region(disk_devt(disk), disk->minors, NULL,
exact_match, exact_lock, disk);
- register_disk(disk);
+ register_disk(parent, disk);
blk_register_queue(disk);
/*
@@ -628,12 +627,11 @@ void add_disk(struct gendisk *disk)
retval = sysfs_create_link(&disk_to_dev(disk)->kobj, &bdi->dev->kobj,
"bdi");
- WARN_ON(retval);
-
disk_add_events(disk);
blk_integrity_add(disk);
+ return retval;
}
-EXPORT_SYMBOL(add_disk);
+EXPORT_SYMBOL(device_add_disk);
void del_gendisk(struct gendisk *disk)
{
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 5c706765404a..6fa03fe589ad 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -431,7 +431,13 @@ static inline void free_part_info(struct hd_struct *part)
extern void part_round_stats(int cpu, struct hd_struct *part);
/* block/genhd.c */
-extern void add_disk(struct gendisk *disk);
+extern int device_add_disk(struct device *parent, struct gendisk *disk);
+static inline void add_disk(struct gendisk *disk)
+{
+ /* temporary while we convert callers to device_add_disk */
+ WARN_ON(device_add_disk(disk->driverfs_dev, disk) != 0);
+}
+
extern void del_gendisk(struct gendisk *gp);
extern struct gendisk *get_gendisk(dev_t dev, int *partno);
extern struct block_device *bdget_disk(struct gendisk *disk, int partno);
next prev parent reply other threads:[~2016-02-25 20:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 20:04 [PATCH 0/3] Introduce device_add_disk() to kill gendisk.driverfs_dev Dan Williams
2016-02-25 20:04 ` Dan Williams [this message]
2016-03-10 8:09 ` [PATCH 1/3] block: introduce device_add_disk() Christoph Hellwig
2016-03-10 15:15 ` Dan Williams
2016-03-10 15:18 ` Christoph Hellwig
2016-03-10 15:27 ` Dan Williams
2016-02-25 20:04 ` [PATCH 2/3] block: convert to device_add_disk() Dan Williams
2016-02-25 20:04 ` [PATCH 3/3] block: remove ->driverfs_dev Dan Williams
2016-03-09 17:38 ` [PATCH 0/3] Introduce device_add_disk() to kill gendisk.driverfs_dev Dan Williams
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=20160225200443.21975.77561.stgit@dwillia2-desk3.amr.corp.intel.com \
--to=dan.j.williams@intel.com \
--cc=axboe@fb.com \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).