Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d1a6b44 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "block: Handle error case when bdi_register_owner() fails"

parents 49bc0822 bd59943e

block/genhd.c

+7 −4
Original line number Diff line number Diff line
@@ -672,7 +672,8 @@ void device_add_disk(struct device *parent, struct gendisk *disk) 


	/* Register BDI before referencing it from bdev */

	bdi = disk->queue->backing_dev_info;

	bdi_register_owner(bdi, disk_to_dev(disk));

	retval = bdi_register_owner(bdi, disk_to_dev(disk));

	WARN_ON(retval);



	blk_register_region(disk_devt(disk), disk->minors, NULL,

			    exact_match, exact_lock, disk);
@@ -685,9 +686,11 @@ void device_add_disk(struct device *parent, struct gendisk *disk) 
	 */

	WARN_ON_ONCE(!blk_get_queue(disk->queue));



	retval = sysfs_create_link(&disk_to_dev(disk)->kobj, &bdi->dev->kobj,

				   "bdi");

	if (!retval) {

		retval = sysfs_create_link(&disk_to_dev(disk)->kobj,

				&bdi->dev->kobj, "bdi");

		WARN_ON(retval);

	}



	disk_add_events(disk);

	blk_integrity_add(disk);