Commit e50ddbff authored by Zhong Jinghua's avatar Zhong Jinghua Committed by Li Nan
Browse files

block: Fix the kabi change on blk_register_region 



hulk inclusion
category: bugfix
bugzilla: 188733

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

Fix kabi change caused by blk_register_region change return value.

Signed-off-by: default avatarZhong Jinghua <zhongjinghua@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parent c72ff754

block/genhd.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -651,11 +651,11 @@ static char *bdevt_str(dev_t devt, char *buf) 
 * The hash chain is sorted on range, so that subranges can override.

 * The hash chain is sorted on range, so that subranges can override.

 * Add error handling.

 * Add error handling.

 */

 */

int blk_register_region(dev_t devt, unsigned long range, struct module *module,

void blk_register_region(dev_t devt, unsigned long range, struct module *module,

			 struct kobject *(*probe)(dev_t, int *, void *),

			 struct kobject *(*probe)(dev_t, int *, void *),

			 int (*lock)(dev_t, void *), void *data)

			 int (*lock)(dev_t, void *), void *data)

{

{

	return kobj_map(bdev_map, devt, range, module, probe, lock, data);

	kobj_map(bdev_map, devt, range, module, probe, lock, data);

}

}





EXPORT_SYMBOL(blk_register_region);

EXPORT_SYMBOL(blk_register_region);
@@ -816,8 +816,8 @@ static int __device_add_disk(struct device *parent, struct gendisk *disk, 
		if (retval)

		if (retval)

			goto out_free_ext_minor;

			goto out_free_ext_minor;

		bdi_set_owner(bdi, ddev);

		bdi_set_owner(bdi, ddev);

		retval = blk_register_region(disk_devt(disk), disk->minors,

		retval = kobj_map(bdev_map, disk_devt(disk), disk->minors, NULL,

				NULL, exact_match, exact_lock, disk);

				  exact_match, exact_lock, disk);

		if (retval)

		if (retval)

			goto out_unregister_bdi;

			goto out_unregister_bdi;

	}

	}

include/linux/genhd.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -374,7 +374,7 @@ extern struct gendisk *__alloc_disk_node(int minors, int node_id); 
extern struct kobject *get_disk_and_module(struct gendisk *disk);

extern struct kobject *get_disk_and_module(struct gendisk *disk);

extern void put_disk(struct gendisk *disk);

extern void put_disk(struct gendisk *disk);

extern void put_disk_and_module(struct gendisk *disk);

extern void put_disk_and_module(struct gendisk *disk);

extern int blk_register_region(dev_t devt, unsigned long range,

extern void blk_register_region(dev_t devt, unsigned long range,

			struct module *module,

			struct module *module,

			struct kobject *(*probe)(dev_t, int *, void *),

			struct kobject *(*probe)(dev_t, int *, void *),

			int (*lock)(dev_t, void *),

			int (*lock)(dev_t, void *),