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

Commit fef912bf authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Jens Axboe
Browse files

block: genhd: add 'groups' argument to device_add_disk 



Update device_add_disk() to take an 'groups' argument so that
individual drivers can register a device with additional sysfs
attributes.
This avoids race condition the driver would otherwise have if these
groups were to be created with sysfs_add_groups().

Signed-off-by: default avatarMartin Wilck <martin.wilck@suse.com>
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6c3b7af1

arch/um/drivers/ubd_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ static int ubd_disk_register(int major, u64 size, int unit, 


	disk->private_data = &ubd_devs[unit];

	disk->queue = ubd_devs[unit].queue;

	device_add_disk(parent, disk);

	device_add_disk(parent, disk, NULL);



	*disk_out = disk;

	return 0;

block/genhd.c

+14 −5
Original line number Diff line number Diff line
@@ -567,7 +567,8 @@ static int exact_lock(dev_t devt, void *data) 
	return 0;

}



static void register_disk(struct device *parent, struct gendisk *disk)

static void register_disk(struct device *parent, struct gendisk *disk,

			  const struct attribute_group **groups)

{

	struct device *ddev = disk_to_dev(disk);

	struct block_device *bdev;
@@ -582,6 +583,10 @@ static void register_disk(struct device *parent, struct gendisk *disk) 
	/* delay uevents, until we scanned partition table */

	dev_set_uevent_suppress(ddev, 1);



	if (groups) {

		WARN_ON(ddev->groups);

		ddev->groups = groups;

	}

	if (device_add(ddev))

		return;

	if (!sysfs_deprecated) {
@@ -647,6 +652,7 @@ static void register_disk(struct device *parent, struct gendisk *disk) 
 * __device_add_disk - add disk information to kernel list

 * @parent: parent device for the disk

 * @disk: per-device partitioning information

 * @groups: Additional per-device sysfs groups

 * @register_queue: register the queue if set to true

 *

 * This function registers the partitioning information in @disk
@@ -655,6 +661,7 @@ static void register_disk(struct device *parent, struct gendisk *disk) 
 * FIXME: error handling

 */

static void __device_add_disk(struct device *parent, struct gendisk *disk,

			      const struct attribute_group **groups,

			      bool register_queue)

{

	dev_t devt;
@@ -698,7 +705,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, 
		blk_register_region(disk_devt(disk), disk->minors, NULL,

				    exact_match, exact_lock, disk);

	}

	register_disk(parent, disk);

	register_disk(parent, disk, groups);

	if (register_queue)

		blk_register_queue(disk);
@@ -712,15 +719,17 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, 
	blk_integrity_add(disk);

}



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

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

		     const struct attribute_group **groups)



{

	__device_add_disk(parent, disk, true);

	__device_add_disk(parent, disk, groups, true);

}

EXPORT_SYMBOL(device_add_disk);



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

{

	__device_add_disk(parent, disk, false);

	__device_add_disk(parent, disk, NULL, false);

}

EXPORT_SYMBOL(device_add_disk_no_queue_reg);

drivers/block/floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -4676,7 +4676,7 @@ static int __init do_floppy_init(void) 
		/* to be cleaned up... */

		disks[drive]->private_data = (void *)(long)drive;

		disks[drive]->flags |= GENHD_FL_REMOVABLE;

		device_add_disk(&floppy_device[drive].dev, disks[drive]);

		device_add_disk(&floppy_device[drive].dev, disks[drive], NULL);

	}



	return 0;

drivers/block/mtip32xx/mtip32xx.c

+1 −1
Original line number Diff line number Diff line
@@ -3861,7 +3861,7 @@ static int mtip_block_initialize(struct driver_data *dd) 
	set_capacity(dd->disk, capacity);



	/* Enable the block device and add it to /dev */

	device_add_disk(&dd->pdev->dev, dd->disk);

	device_add_disk(&dd->pdev->dev, dd->disk, NULL);



	dd->bdev = bdget_disk(dd->disk, 0);

	/*

drivers/block/ps3disk.c

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev) 
		 gendisk->disk_name, priv->model, priv->raw_capacity >> 11,

		 get_capacity(gendisk) >> 11);



	device_add_disk(&dev->sbd.core, gendisk);

	device_add_disk(&dev->sbd.core, gendisk, NULL);

	return 0;



fail_cleanup_queue: