Commit 3ada8b7e authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

block: struct device - replace bus_id with dev_name(), dev_set_name() 



Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4383fc3d

block/bsg.c

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct bsg_device { 
	int done_cmds;

	wait_queue_head_t wq_done;

	wait_queue_head_t wq_free;

	char name[BUS_ID_SIZE];

	char name[20];

	int max_queue;

	unsigned long flags;

};
@@ -781,7 +781,7 @@ static struct bsg_device *bsg_add_device(struct inode *inode, 
	mutex_lock(&bsg_mutex);

	hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode)));



	strncpy(bd->name, rq->bsg_dev.class_dev->bus_id, sizeof(bd->name) - 1);

	strncpy(bd->name, dev_name(rq->bsg_dev.class_dev), sizeof(bd->name) - 1);

	dprintk("bound to <%s>, max queue %d\n",

		format_dev_t(buf, inode->i_rdev), bd->max_queue);
@@ -992,7 +992,7 @@ int bsg_register_queue(struct request_queue *q, struct device *parent, 
	if (name)

		devname = name;

	else

		devname = parent->bus_id;

		devname = dev_name(parent);



	/*

	 * we need a proper transport to send commands, not a stacked device

block/genhd.c

+1 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ dev_t blk_lookup_devt(const char *name, int partno) 
		struct gendisk *disk = dev_to_disk(dev);

		struct hd_struct *part;



		if (strcmp(dev->bus_id, name))

		if (strcmp(dev_name(dev), name))

			continue;



		part = disk_get_part(disk, partno);

fs/partitions/check.c

+3 −8
Original line number Diff line number Diff line
@@ -384,9 +384,9 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno, 


	dname = dev_name(ddev);

	if (isdigit(dname[strlen(dname) - 1]))

		snprintf(pdev->bus_id, BUS_ID_SIZE, "%sp%d", dname, partno);

		dev_set_name(pdev, "%sp%d", dname, partno);

	else

		snprintf(pdev->bus_id, BUS_ID_SIZE, "%s%d", dname, partno);

		dev_set_name(pdev, "%s%d", dname, partno);



	device_initialize(pdev);

	pdev->class = &block_class;
@@ -447,16 +447,11 @@ void register_disk(struct gendisk *disk) 
	struct block_device *bdev;

	struct disk_part_iter piter;

	struct hd_struct *part;

	char *s;

	int err;



	ddev->parent = disk->driverfs_dev;



	strlcpy(ddev->bus_id, disk->disk_name, BUS_ID_SIZE);

	/* ewww... some of these buggers have / in the name... */

	s = strchr(ddev->bus_id, '/');

	if (s)

		*s = '!';

	dev_set_name(ddev, disk->disk_name);



	/* delay uevents, until we scanned partition table */

	ddev->uevent_suppress = 1;