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

block: Fix the kabi change in device_add_disk 



hulk inclusion
category: bugfix
bugzilla: 188733

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

Fix the kabi change caused by changing the return value of
device_add_disk.

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

block/genhd.c

+19 −2
Original line number Diff line number Diff line
@@ -925,20 +925,37 @@ static int __device_add_disk(struct device *parent, struct gendisk *disk, 
	return WARN_ON_ONCE(retval); /* keep until all callers handle errors */

}



int device_add_disk(struct device *parent, struct gendisk *disk,

void device_add_disk(struct device *parent, struct gendisk *disk,

		     const struct attribute_group **groups)



{

	return __device_add_disk(parent, disk, groups, true);

	__device_add_disk(parent, disk, groups, true);

}

EXPORT_SYMBOL(device_add_disk);





int __must_check device_add_disk_safe(struct device *parent,

		     struct gendisk *disk,

		     const struct attribute_group **groups)



{

	return __device_add_disk(parent, disk, groups, true);

}

EXPORT_SYMBOL(device_add_disk_safe);



void device_add_disk_no_queue_reg(struct device *parent, struct gendisk *disk)

{

	__device_add_disk(parent, disk, NULL, false);

}

EXPORT_SYMBOL(device_add_disk_no_queue_reg);



int __must_check device_add_disk_no_queue_reg_safe(struct device *parent,

						   struct gendisk *disk)

{

	return __device_add_disk(parent, disk, NULL, false);

}

EXPORT_SYMBOL(device_add_disk_no_queue_reg_safe);



static void invalidate_partition(struct gendisk *disk, int partno)

{

	struct block_device *bdev;

include/linux/genhd.h

+16 −3
Original line number Diff line number Diff line
@@ -305,17 +305,30 @@ extern bool disk_has_partitions(struct gendisk *disk); 


/* block/genhd.c */

extern unsigned int part_in_flight(struct hd_struct *part);

extern int device_add_disk(struct device *parent, struct gendisk *disk,

extern void device_add_disk(struct device *parent, struct gendisk *disk,

			    const struct attribute_group **groups);

static inline int add_disk(struct gendisk *disk)

extern int __must_check device_add_disk_safe(struct device *parent,

			    struct gendisk *disk,

			    const struct attribute_group **groups);

static inline void add_disk(struct gendisk *disk)

{

	return device_add_disk(NULL, disk, NULL);

	device_add_disk(NULL, disk, NULL);

}

extern void device_add_disk_no_queue_reg(struct device *parent, struct gendisk *disk);

extern int __must_check device_add_disk_no_queue_reg_safe(struct device *parent,

							  struct gendisk *disk);

static inline void add_disk_no_queue_reg(struct gendisk *disk)

{

	device_add_disk_no_queue_reg(NULL, disk);

}

static inline int __must_check add_disk_no_queue_reg_safe(struct gendisk *disk)

{

	return device_add_disk_no_queue_reg_safe(NULL, disk);

}

static inline int __must_check add_disk_safe(struct gendisk *disk)

{

	return device_add_disk_safe(NULL, disk, NULL);

}



extern void del_gendisk(struct gendisk *gp);

extern struct gendisk *get_gendisk(dev_t dev, int *partno);