Commit 41d512e5 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-4.8/block' of... 

Merge branch 'for-4.8/block' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm into for-4.8/drivers

Dan writes:

"The removal of ->driverfs_dev in favor of just passing the parent
device in as a parameter to add_disk().  See below, it has received a
"Reviewed-by" from Christoph, Bart, and Johannes.

It is also a pre-requisite for Fam Zheng's work to cleanup gendisk
uevents vs attribute visibility [1].  We would extend device_add_disk()
to take an attribute_group list.

This is based off a branch of block.git/for-4.8/drivers and has
received a positive build success notification from the kbuild robot
across several configs.

[1]: "gendisk: Generate uevent after attribute available"
http://marc.info/?l=linux-virtualization&m=146725201522201&w=2"
parents 71102307 52c44d93

arch/powerpc/sysdev/axonram.c

+1 −2
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ static int axon_ram_probe(struct platform_device *device) 
	bank->disk->first_minor = azfs_minor;

	bank->disk->fops = &axon_ram_devops;

	bank->disk->private_data = bank;

	bank->disk->driverfs_dev = &device->dev;



	sprintf(bank->disk->disk_name, "%s%d",

			AXON_RAM_DEVICE_NAME, axon_ram_bank_id);
@@ -238,7 +237,7 @@ static int axon_ram_probe(struct platform_device *device) 
	set_capacity(bank->disk, bank->size >> AXON_RAM_SECTOR_SHIFT);

	blk_queue_make_request(bank->disk->queue, axon_ram_make_request);

	blk_queue_logical_block_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);

	add_disk(bank->disk);

	device_add_disk(&device->dev, bank->disk);



	bank->irq_id = irq_of_parse_and_map(device->dev.of_node, 0);

	if (bank->irq_id == NO_IRQ) {

arch/um/drivers/ubd_kern.c

+3 −2
Original line number Diff line number Diff line
@@ -801,6 +801,7 @@ static void ubd_device_release(struct device *dev) 
static int ubd_disk_register(int major, u64 size, int unit,

			     struct gendisk **disk_out)

{

	struct device *parent = NULL;

	struct gendisk *disk;



	disk = alloc_disk(1 << UBD_SHIFT);
@@ -823,12 +824,12 @@ static int ubd_disk_register(int major, u64 size, int unit, 
		ubd_devs[unit].pdev.dev.release = ubd_device_release;

		dev_set_drvdata(&ubd_devs[unit].pdev.dev, &ubd_devs[unit]);

		platform_device_register(&ubd_devs[unit].pdev);

		disk->driverfs_dev = &ubd_devs[unit].pdev.dev;

		parent = &ubd_devs[unit].pdev.dev;

	}



	disk->private_data = &ubd_devs[unit];

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

	add_disk(disk);

	device_add_disk(parent, disk);



	*disk_out = disk;

	return 0;

block/genhd.c

+9 −9
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ static int exact_lock(dev_t devt, void *data) 
	return 0;

}



static void register_disk(struct gendisk *disk)

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

{

	struct device *ddev = disk_to_dev(disk);

	struct block_device *bdev;
@@ -514,7 +514,7 @@ static void register_disk(struct gendisk *disk) 
	struct hd_struct *part;

	int err;



	ddev->parent = disk->driverfs_dev;

	ddev->parent = parent;



	dev_set_name(ddev, "%s", disk->disk_name);
@@ -573,7 +573,8 @@ exit: 
}



/**

 * add_disk - add partitioning information to kernel list

 * device_add_disk - add partitioning information to kernel list

 * @parent: parent device for the disk

 * @disk: per-device partitioning information

 *

 * This function registers the partitioning information in @disk
@@ -581,7 +582,7 @@ exit: 
 *

 * FIXME: error handling

 */

void add_disk(struct gendisk *disk)

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

{

	struct backing_dev_info *bdi;

	dev_t devt;
@@ -617,7 +618,7 @@ void add_disk(struct gendisk *disk) 


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

			    exact_match, exact_lock, disk);

	register_disk(disk);

	register_disk(parent, disk);

	blk_register_queue(disk);



	/*
@@ -633,7 +634,7 @@ void add_disk(struct gendisk *disk) 
	disk_add_events(disk);

	blk_integrity_add(disk);

}

EXPORT_SYMBOL(add_disk);

EXPORT_SYMBOL(device_add_disk);



void del_gendisk(struct gendisk *disk)

{
@@ -799,10 +800,9 @@ void __init printk_all_partitions(void) 
			       , disk_name(disk, part->partno, name_buf),

			       part->info ? part->info->uuid : "");

			if (is_part0) {

				if (disk->driverfs_dev != NULL &&

				    disk->driverfs_dev->driver != NULL)

				if (dev->parent && dev->parent->driver)

					printk(" driver: %s\n",

					      disk->driverfs_dev->driver->name);

					      dev->parent->driver->name);

				else

					printk(" (driver?)\n");

			} else

drivers/block/cciss.c

+1 −2
Original line number Diff line number Diff line
@@ -1951,7 +1951,6 @@ static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk, 
	if (cciss_create_ld_sysfs_entry(h, drv_index))

		goto cleanup_queue;

	disk->private_data = h->drv[drv_index];

	disk->driverfs_dev = &h->drv[drv_index]->dev;



	/* Set up queue information */

	blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask);
@@ -1973,7 +1972,7 @@ static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk, 
	/* allows the interrupt handler to start the queue */

	wmb();

	h->drv[drv_index]->queue = disk->queue;

	add_disk(disk);

	device_add_disk(&h->drv[drv_index]->dev, disk);

	return 0;



cleanup_queue:

drivers/block/floppy.c

+1 −2
Original line number Diff line number Diff line
@@ -4350,8 +4350,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;

		disks[drive]->driverfs_dev = &floppy_device[drive].dev;

		add_disk(disks[drive]);

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

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE