diff options
| author | Jens Axboe <axboe@fb.com> | 2016-07-09 01:04:11 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-07-09 01:04:11 +0300 |
| commit | 41d512e51b5e59ee2598f74249799dcc6b0a06f2 (patch) | |
| tree | 643954473c2893accfd6f45e7ea9e608023c1c51 /include | |
| parent | 7110230719602852481c2793d054f866b2bf4a2b (diff) | |
| parent | 52c44d93c26f5a76068c0a8cc83bb8f56f38043d (diff) | |
| download | linux-41d512e51b5e59ee2598f74249799dcc6b0a06f2.tar.xz | |
Merge branch 'for-4.8/block' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm into for-4.8/drivers
Dan writes:
"The removal of ->driverfs_dev in favor of just passing the parent
device in as a parameter to add_disk(). See below, it has received a
"Reviewed-by" from Christoph, Bart, and Johannes.
It is also a pre-requisite for Fam Zheng's work to cleanup gendisk
uevents vs attribute visibility [1]. We would extend device_add_disk()
to take an attribute_group list.
This is based off a branch of block.git/for-4.8/drivers and has
received a positive build success notification from the kbuild robot
across several configs.
[1]: "gendisk: Generate uevent after attribute available"
http://marc.info/?l=linux-virtualization&m=146725201522201&w=2"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/genhd.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 359a8e4bd44d..1dbf52f9c24b 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -205,7 +205,6 @@ struct gendisk { void *private_data; int flags; - struct device *driverfs_dev; // FIXME: remove struct kobject *slave_dir; struct timer_rand_state *random; @@ -414,7 +413,12 @@ 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 void device_add_disk(struct device *parent, struct gendisk *disk); +static inline void add_disk(struct gendisk *disk) +{ + device_add_disk(NULL, disk); +} + 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); |