[PATCH 4/4] virtio_blk: use disk_name_format() to support mass of disks naming
STALE5285d
From: Ren Mingxin <hidden>
Date: 2012-03-30 09:53:52
Subsystem:
block layer, the rest, virtio block and scsi drivers, virtio core · Maintainers:
Jens Axboe, Linus Torvalds, "Michael S. Tsirkin", Jason Wang, Eugenio Pérez
Possibly related (same subject, not in this thread)
- 2012-04-12 · Re: [PATCH 4/4] virtio_blk: use disk_name_format() to support mass of disks naming · Jeff Garzik <hidden>
- 2012-04-09 · Re: [PATCH 4/4] virtio_blk: use disk_name_format() to support mass of disks naming · "Michael S. Tsirkin" <mst@redhat.com>
- 2012-04-09 · Re: [PATCH 4/4] virtio_blk: use disk_name_format() to support mass of disks naming · "Michael S. Tsirkin" <mst@redhat.com>
- 2012-04-09 · Re: [PATCH 4/4] virtio_blk: use disk_name_format() to support mass of disks naming · Ren Mingxin <hidden>
- 2012-04-04 · Re: [PATCH 4/4] virtio_blk: use disk_name_format() to support mass of disks naming · "Michael S. Tsirkin" <mst@redhat.com>
The current virtblk's naming algorithm only supports 263 disks. If there are mass of virtblks(exceeding 263), there will be disks with the same name. By renaming "sd_format_disk_name()" to "disk_name_format()" and moving it into block core, virtio_blk can use this function to support mass of disks. Signed-off-by: Ren Mingxin <redacted> --- virtio_blk.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index c4a60ba..54612c2 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c@@ -442,18 +442,7 @@ static int __devinit virtblk_probe(struct virtio_device *vdev) q->queuedata = vblk; - if (index < 26) { - sprintf(vblk->disk->disk_name, "vd%c", 'a' + index % 26); - } else if (index < (26 + 1) * 26) { - sprintf(vblk->disk->disk_name, "vd%c%c", - 'a' + index / 26 - 1, 'a' + index % 26); - } else { - const unsigned int m1 = (index / 26 - 1) / 26 - 1; - const unsigned int m2 = (index / 26 - 1) % 26; - const unsigned int m3 = index % 26; - sprintf(vblk->disk->disk_name, "vd%c%c%c", - 'a' + m1, 'a' + m2, 'a' + m3); - } + disk_name_format("vd", index, vblk->disk->disk_name, DISK_NAME_LEN); vblk->disk->major = major; vblk->disk->first_minor = index_to_minor(index);