GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-28 01:04:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: introduce device_add_disk()

Browse source 
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().  For
now this maintains the status quo of WARN()ing on failure, but not
return a error code.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2016-06-15 18:17:27 -07:00
parent 1b57e66384
commit e63a46bef0
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
block/genhd.c
View file

@ -506,7 +506,7 @@ static int exact_lock(dev_t devt, void *data)
return 0; 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 device *ddev = disk_to_dev(disk);
struct block_device *bdev; struct block_device *bdev;
@ -514,7 +514,7 @@ static void register_disk(struct gendisk *disk)
struct hd_struct *part; struct hd_struct *part;
int err; int err;
ddev->parent = disk->driverfs_dev; ddev->parent = parent;
dev_set_name(ddev, "%s", disk->disk_name); 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 * @disk: per-device partitioning information
* *
* This function registers the partitioning information in @disk * This function registers the partitioning information in @disk
@ -581,7 +582,7 @@ exit:
* *
* FIXME: error handling * FIXME: error handling
*/ */
void add_disk(struct gendisk *disk) void device_add_disk(struct device *parent, struct gendisk *disk)
{ {
struct backing_dev_info *bdi; struct backing_dev_info *bdi;
dev_t devt; dev_t devt;
@ -617,7 +618,11 @@ void add_disk(struct gendisk *disk)
blk_register_region(disk_devt(disk), disk->minors, NULL, blk_register_region(disk_devt(disk), disk->minors, NULL,
exact_match, exact_lock, disk); exact_match, exact_lock, disk);
register_disk(disk);
/* temporary while we convert usages to use disk_to_dev(disk)->parent */
disk->driverfs_dev = parent;
register_disk(parent, disk);
blk_register_queue(disk); blk_register_queue(disk);
/* /*
@ -633,7 +638,7 @@ void add_disk(struct gendisk *disk)
disk_add_events(disk); disk_add_events(disk);
blk_integrity_add(disk); blk_integrity_add(disk);
} }
EXPORT_SYMBOL(add_disk); EXPORT_SYMBOL(device_add_disk);
void del_gendisk(struct gendisk *disk) void del_gendisk(struct gendisk *disk)
{ {

8
include/linux/genhd.h
View file

@ -414,7 +414,13 @@ static inline void free_part_info(struct hd_struct *part)
extern void part_round_stats(int cpu, struct hd_struct *part); extern void part_round_stats(int cpu, struct hd_struct *part);
/* block/genhd.c */ /* 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)
{
/* temporary while we convert callers to device_add_disk */
device_add_disk(disk->driverfs_dev, disk);
}
extern void del_gendisk(struct gendisk *gp); extern void del_gendisk(struct gendisk *gp);
extern struct gendisk *get_gendisk(dev_t dev, int *partno); extern struct gendisk *get_gendisk(dev_t dev, int *partno);
extern struct block_device *bdget_disk(struct gendisk *disk, int partno); extern struct block_device *bdget_disk(struct gendisk *disk, int partno);