Commit 8fb9434f authored Nov 25, 2023 by Zhong Jinghua Committed by Li Nan Nov 25, 2023

block: return errors from blk_register_region

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I81XCK



----------------------------------------

Modify the return value type of blk_register_region to prepare for
adding error handling.

Signed-off-by: Zhong Jinghua <zhongjinghua@huawei.com>
Signed-off-by: Li Nan <linan122@huawei.com>

parent 62c5af18

block/genhd.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -649,12 +649,13 @@ static char bdevt_str(dev_t devt, char buf)
		* Register device numbers dev..(dev+range-1)
		* range must be nonzero
		* The hash chain is sorted on range, so that subranges can override.
		* Add error handling.
		*/
		void blk_register_region(dev_t devt, unsigned long range, struct module *module,
		int blk_register_region(dev_t devt, unsigned long range, struct module *module,
		struct kobject (probe)(dev_t, int , void ),
		int (lock)(dev_t, void ), void *data)
		{
		kobj_map(bdev_map, devt, range, module, probe, lock, data);
		return kobj_map(bdev_map, devt, range, module, probe, lock, data);
		}

		EXPORT_SYMBOL(blk_register_region);

include/linux/genhd.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -361,7 +361,7 @@ extern struct gendisk *__alloc_disk_node(int minors, int node_id);
		extern struct kobject get_disk_and_module(struct gendisk disk);
		extern void put_disk(struct gendisk *disk);
		extern void put_disk_and_module(struct gendisk *disk);
		extern void blk_register_region(dev_t devt, unsigned long range,
		extern int blk_register_region(dev_t devt, unsigned long range,
		struct module *module,
		struct kobject (probe)(dev_t, int , void ),
		int (lock)(dev_t, void ),