block: move register_disk() from fs/partitions/check.c to genhd.c and unexport it
PATCH 1/1 block: move register_disk() from fs/partitions/check.c to genhd.c and unexport it
From: Kay Sievers <[email protected]>
Subject: block: move register_disk() from fs/partitions/check.c to genhd.c and unexport it
Disk code belongs into genhd, not in the partition code. Follow-up patches will need to re-shuffle some code, which needs to be in one file, to fix bad sysfs attribute creation timing.
Signed-off-by Kay Sievers <[email protected]>
--- block/genhd.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/partitions/check.c | 59 ------------------------------------------------- include/linux/blkdev.h | 1 3 files changed, 58 insertions(+), 60 deletions(-)
block/genhd.c +58 -0
@@ -504,6 +504,64 @@ static int exact_lock(dev_t devt, void *return 0 ; } +static void register_disk (struct gendisk *disk) +{ +struct device *ddev =disk_to_dev (disk); +struct block_device *bdev; +struct disk_part_iter piter; +struct hd_struct *part; +int err; + + ddev->parent = disk->driverfs_dev; + +dev_set_name (ddev, disk->disk_name); + +/* delay uevents, until we scanned partition table */ +dev_set_uevent_suppress (ddev,1 ); + +if (device_add (ddev)) +return ; +#ifndef CONFIG_SYSFS_DEPRECATED + err =sysfs_create_link (block_depr, &ddev->kobj, +kobject_name (&ddev->kobj)); +if (err) { +device_del (ddev); +return ; + } +#endif + disk->part0.holder_dir =kobject_create_and_add ("holders" , &ddev->kobj); + disk->slave_dir =kobject_create_and_add ("slaves" , &ddev->kobj); + +/* No minors to use for partitions */ +if (!disk_partitionable (disk)) + goto exit; + +/* No such device (e.g., media were just removed) */ +if (!get_capacity (disk)) + goto exit; + + bdev =bdget_disk (disk,0 ); +if (!bdev) + goto exit; + + bdev->bd_invalidated =1 ; + err =blkdev_get (bdev,FMODE_READ ); +if (err <0 ) + goto exit; +blkdev_put (bdev,FMODE_READ ); + +exit: +/* announce disk after possible partitions are created */ +dev_set_uevent_suppress (ddev,0 ); +kobject_uevent (&ddev->kobj,KOBJ_ADD ); + +/* announce possible partitions */ +disk_part_iter_init (&piter, disk,0 ); +while ((part =disk_part_iter_next (&piter))) +kobject_uevent (&part_to_dev (part)->kobj,KOBJ_ADD ); +disk_part_iter_exit (&piter); +} +/** * add_disk - add partitioning information to kernel list * @disk: per-device partitioning information
fs/partitions/check.c +0 -59
65 lines not on this page · raw message
include/linux/blkdev.h +0 -1
@@ -771,7 +771,6 @@ static inline void rq_flush_dcache_pagesextern int blk_register_queue (struct gendisk *disk);extern void blk_unregister_queue (struct gendisk *disk); -extern void register_disk (struct gendisk *dev);extern void generic_make_request (struct bio *bio);extern void blk_rq_init (struct request_queue *q,struct request *rq);extern void blk_put_request (struct request *);