vserver 1.9.5.x5

[linux-2.6.git] / drivers / block / sx8.c

diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 02a541a..797f598 100644 (file)
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1503,7 +1503,8 @@ static int carm_init_disks(struct carm_host *host)
                }
 
                port->disk = disk;
-               sprintf(disk->disk_name, DRV_NAME "%u_%u", host->id, i);
+               sprintf(disk->disk_name, DRV_NAME "/%u",
+                       (unsigned int) (host->id * CARM_MAX_PORTS) + i);
                sprintf(disk->devfs_name, DRV_NAME "/%u_%u", host->id, i);
                disk->major = host->major;
                disk->first_minor = i * CARM_MINORS_PER_MAJOR;