[PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed

+2 -6

arch/um/drivers/ubd_kern.c

··· 637 637 disk->first_minor = unit << UBD_SHIFT; 638 638 disk->fops = &ubd_blops; 639 639 set_capacity(disk, size / 512); 640 - if(major == MAJOR_NR){ 640 + if(major == MAJOR_NR) 641 641 sprintf(disk->disk_name, "ubd%c", 'a' + unit); 642 - sprintf(disk->devfs_name, "ubd/disc%d", unit); 643 - } 644 - else { 642 + else 645 643 sprintf(disk->disk_name, "ubd_fake%d", unit); 646 - sprintf(disk->devfs_name, "ubd_fake/disc%d", unit); 647 - } 648 644 649 645 /* sysfs register (not for ide fake devices) */ 650 646 if (major == MAJOR_NR) {

-1

drivers/block/DAC960.c

··· 2530 2530 blk_queue_max_sectors(RequestQueue, Controller->MaxBlocksPerCommand); 2531 2531 disk->queue = RequestQueue; 2532 2532 sprintf(disk->disk_name, "rd/c%dd%d", Controller->ControllerNumber, n); 2533 - sprintf(disk->devfs_name, "rd/host%d/target%d", Controller->ControllerNumber, n); 2534 2533 disk->major = MajorNumber; 2535 2534 disk->first_minor = n << DAC960_MaxPartitionsBits; 2536 2535 disk->fops = &DAC960_BlockDeviceOperations;

+1 -4

drivers/block/acsi.c

··· 1732 1732 struct gendisk *disk = acsi_gendisk[i]; 1733 1733 sprintf(disk->disk_name, "ad%c", 'a'+i); 1734 1734 aip = &acsi_info[NDevices]; 1735 - sprintf(disk->devfs_name, "ad/target%d/lun%d", aip->target, aip->lun); 1736 1735 disk->major = ACSI_MAJOR; 1737 1736 disk->first_minor = i << 4; 1738 - if (acsi_info[i].type != HARDDISK) { 1737 + if (acsi_info[i].type != HARDDISK) 1739 1738 disk->minors = 1; 1740 - strcat(disk->devfs_name, "/disc"); 1741 - } 1742 1739 disk->fops = &acsi_fops; 1743 1740 disk->private_data = &acsi_info[i]; 1744 1741 set_capacity(disk, acsi_info[i].size);

-1

drivers/block/cciss.c

··· 3248 3248 3249 3249 q->queuedata = hba[i]; 3250 3250 sprintf(disk->disk_name, "cciss/c%dd%d", i, j); 3251 - sprintf(disk->devfs_name, "cciss/host%d/target%d", i, j); 3252 3251 disk->major = hba[i]->major; 3253 3252 disk->first_minor = j << NWD_SHIFT; 3254 3253 disk->fops = &cciss_fops;

-2

drivers/block/cpqarray.c

··· 1805 1805 1806 1806 } 1807 1807 1808 - sprintf(disk->devfs_name, "ida/c%dd%d", ctlr, log_unit); 1809 - 1810 1808 info_p->phys_drives = 1811 1809 sense_config_buf->ctlr_phys_drv; 1812 1810 info_p->drv_assign_map

-1

drivers/block/loop.c

··· 1293 1293 disk->first_minor = i; 1294 1294 disk->fops = &lo_fops; 1295 1295 sprintf(disk->disk_name, "loop%d", i); 1296 - sprintf(disk->devfs_name, "loop/%d", i); 1297 1296 disk->private_data = lo; 1298 1297 disk->queue = lo->lo_queue; 1299 1298 }

-1

drivers/block/nbd.c

··· 657 657 disk->private_data = &nbd_dev[i]; 658 658 disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO; 659 659 sprintf(disk->disk_name, "nbd%d", i); 660 - sprintf(disk->devfs_name, "nbd/%d", i); 661 660 set_capacity(disk, 0x7ffffc00ULL << 1); /* 2 TB */ 662 661 add_disk(disk); 663 662 }

-1

drivers/block/ps2esdi.c

··· 421 421 disk->major = PS2ESDI_MAJOR; 422 422 disk->first_minor = i<<6; 423 423 sprintf(disk->disk_name, "ed%c", 'a'+i); 424 - sprintf(disk->devfs_name, "ed/target%d", i); 425 424 disk->fops = &ps2esdi_fops; 426 425 ps2esdi_gendisk[i] = disk; 427 426 }

-1

drivers/block/rd.c

··· 457 457 disk->queue = rd_queue[i]; 458 458 disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO; 459 459 sprintf(disk->disk_name, "ram%d", i); 460 - sprintf(disk->devfs_name, "rd/%d", i); 461 460 set_capacity(disk, rd_size * 2); 462 461 add_disk(rd_disks[i]); 463 462 }

-1

drivers/block/swim3.c

··· 1061 1061 disk->queue = swim3_queue; 1062 1062 disk->flags |= GENHD_FL_REMOVABLE; 1063 1063 sprintf(disk->disk_name, "fd%d", i); 1064 - sprintf(disk->devfs_name, "floppy/%d", i); 1065 1064 set_capacity(disk, 2880); 1066 1065 add_disk(disk); 1067 1066 }

-1

drivers/block/sx8.c

··· 1509 1509 port->disk = disk; 1510 1510 sprintf(disk->disk_name, DRV_NAME "/%u", 1511 1511 (unsigned int) (host->id * CARM_MAX_PORTS) + i); 1512 - sprintf(disk->devfs_name, DRV_NAME "/%u_%u", host->id, i); 1513 1512 disk->major = host->major; 1514 1513 disk->first_minor = i * CARM_MINORS_PER_MAJOR; 1515 1514 disk->fops = &carm_bd_ops;

-2

drivers/block/ub.c

··· 28 28 #include <scsi/scsi.h> 29 29 30 30 #define DRV_NAME "ub" 31 - #define DEVFS_NAME DRV_NAME 32 31 33 32 #define UB_MAJOR 180 34 33 ··· 2289 2290 goto err_diskalloc; 2290 2291 2291 2292 sprintf(disk->disk_name, DRV_NAME "%c", lun->id + 'a'); 2292 - sprintf(disk->devfs_name, DEVFS_NAME "/%c", lun->id + 'a'); 2293 2293 disk->major = UB_MAJOR; 2294 2294 disk->first_minor = lun->id * UB_PARTS_PER_LUN; 2295 2295 disk->fops = &ub_bd_fops;

-1

drivers/block/umem.c

··· 1192 1192 for (i = 0; i < num_cards; i++) { 1193 1193 struct gendisk *disk = mm_gendisk[i]; 1194 1194 sprintf(disk->disk_name, "umem%c", 'a'+i); 1195 - sprintf(disk->devfs_name, "umem/card%d", i); 1196 1195 spin_lock_init(&cards[i].lock); 1197 1196 disk->major = major_nr; 1198 1197 disk->first_minor = i << MM_SHIFT;

-2

drivers/block/viodasd.c

··· 523 523 else 524 524 snprintf(g->disk_name, sizeof(g->disk_name), 525 525 VIOD_GENHD_NAME "%c", 'a' + (dev_no % 26)); 526 - snprintf(g->devfs_name, sizeof(g->devfs_name), 527 - "%s%d", VIOD_GENHD_DEVFS_NAME, dev_no); 528 526 g->fops = &viodasd_fops; 529 527 g->queue = q; 530 528 g->private_data = d;

-1

drivers/block/xd.c

··· 215 215 disk->major = XT_DISK_MAJOR; 216 216 disk->first_minor = i<<6; 217 217 sprintf(disk->disk_name, "xd%c", i+'a'); 218 - sprintf(disk->devfs_name, "xd/target%d", i); 219 218 disk->fops = &xd_fops; 220 219 disk->private_data = p; 221 220 disk->queue = xd_queue;

-1

drivers/block/z2ram.c

··· 354 354 z2ram_gendisk->first_minor = 0; 355 355 z2ram_gendisk->fops = &z2_fops; 356 356 sprintf(z2ram_gendisk->disk_name, "z2ram"); 357 - strcpy(z2ram_gendisk->devfs_name, z2ram_gendisk->disk_name); 358 357 359 358 z2ram_gendisk->queue = z2_queue; 360 359 add_disk(z2ram_gendisk);

-1

drivers/cdrom/aztcd.c

··· 1918 1918 azt_disk->first_minor = 0; 1919 1919 azt_disk->fops = &azt_fops; 1920 1920 sprintf(azt_disk->disk_name, "aztcd"); 1921 - sprintf(azt_disk->devfs_name, "aztcd"); 1922 1921 azt_disk->queue = azt_queue; 1923 1922 add_disk(azt_disk); 1924 1923 azt_invalidate_buffers();

-1

drivers/cdrom/gscd.c

··· 955 955 gscd_disk->first_minor = 0; 956 956 gscd_disk->fops = &gscd_fops; 957 957 sprintf(gscd_disk->disk_name, "gscd"); 958 - sprintf(gscd_disk->devfs_name, "gscd"); 959 958 960 959 if (register_blkdev(MAJOR_NR, "gscd")) { 961 960 ret = -EIO;

-1

drivers/cdrom/optcd.c

··· 2033 2033 optcd_disk->first_minor = 0; 2034 2034 optcd_disk->fops = &opt_fops; 2035 2035 sprintf(optcd_disk->disk_name, "optcd"); 2036 - sprintf(optcd_disk->devfs_name, "optcd"); 2037 2036 2038 2037 if (!request_region(optcd_port, 4, "optcd")) { 2039 2038 printk(KERN_ERR "optcd: conflict, I/O port 0x%x already used\n",

-1

drivers/cdrom/sbpcd.c

··· 5868 5868 disk->fops = &sbpcd_bdops; 5869 5869 strcpy(disk->disk_name, sbpcd_infop->name); 5870 5870 disk->flags = GENHD_FL_CD; 5871 - sprintf(disk->devfs_name, "sbp/c0t%d", p->drv_id); 5872 5871 p->disk = disk; 5873 5872 if (register_cdrom(sbpcd_infop)) 5874 5873 {

-1

drivers/cdrom/sjcd.c

··· 1695 1695 sjcd_disk->first_minor = 0, 1696 1696 sjcd_disk->fops = &sjcd_fops, 1697 1697 sprintf(sjcd_disk->disk_name, "sjcd"); 1698 - sprintf(sjcd_disk->devfs_name, "sjcd"); 1699 1698 1700 1699 if (!request_region(sjcd_base, 4,"sjcd")) { 1701 1700 printk

-1

drivers/cdrom/sonycd535.c

··· 1589 1589 cdu_disk->first_minor = 0; 1590 1590 cdu_disk->fops = &cdu_fops; 1591 1591 sprintf(cdu_disk->disk_name, "cdu"); 1592 - sprintf(cdu_disk->devfs_name, "cdu535"); 1593 1592 1594 1593 if (!request_region(sony535_cd_base_io, 4, CDU535_HANDLE)) { 1595 1594 printk(KERN_WARNING"sonycd535: Unable to request region 0x%x\n",

-2

drivers/cdrom/viocd.c

··· 688 688 gendisk->first_minor = deviceno; 689 689 strncpy(gendisk->disk_name, c->name, 690 690 sizeof(gendisk->disk_name)); 691 - snprintf(gendisk->devfs_name, sizeof(gendisk->devfs_name), 692 - VIOCD_DEVICE_DEVFS "%d", deviceno); 693 691 blk_queue_max_hw_segments(q, 1); 694 692 blk_queue_max_phys_segments(q, 1); 695 693 blk_queue_max_sectors(q, 4096 / 512);

+2 -5

drivers/md/md.c

··· 2910 2910 } 2911 2911 disk->major = MAJOR(dev); 2912 2912 disk->first_minor = unit << shift; 2913 - if (partitioned) { 2913 + if (partitioned) 2914 2914 sprintf(disk->disk_name, "md_d%d", unit); 2915 - sprintf(disk->devfs_name, "md/d%d", unit); 2916 - } else { 2915 + else 2917 2916 sprintf(disk->disk_name, "md%d", unit); 2918 - sprintf(disk->devfs_name, "md/%d", unit); 2919 - } 2920 2917 disk->fops = &md_fops; 2921 2918 disk->private_data = mddev; 2922 2919 disk->queue = mddev->queue;

-1

drivers/message/i2o/i2o_block.c

··· 1089 1089 gd = i2o_blk_dev->gd; 1090 1090 gd->first_minor = unit << 4; 1091 1091 sprintf(gd->disk_name, "i2o/hd%c", 'a' + unit); 1092 - sprintf(gd->devfs_name, "i2o/hd%c", 'a' + unit); 1093 1092 gd->driverfs_dev = &i2o_dev->device; 1094 1093 1095 1094 /* setup request queue */

-1

drivers/mmc/mmc_block.c

··· 408 408 */ 409 409 410 410 sprintf(md->disk->disk_name, "mmcblk%d", devidx); 411 - sprintf(md->disk->devfs_name, "mmc/blk%d", devidx); 412 411 413 412 blk_queue_hardsect_size(md->queue.queue, 1 << md->block_bits); 414 413

-2

drivers/s390/block/dasd_genhd.c

··· 68 68 } 69 69 len += sprintf(gdp->disk_name + len, "%c", 'a'+(device->devindex%26)); 70 70 71 - sprintf(gdp->devfs_name, "dasd/%s", device->cdev->dev.bus_id); 72 - 73 71 if (device->features & DASD_FEATURE_READONLY) 74 72 set_disk_ro(gdp, 1); 75 73 gdp->private_data = device;

-1

drivers/s390/block/xpram.c

··· 466 466 disk->private_data = &xpram_devices[i]; 467 467 disk->queue = xpram_queue; 468 468 sprintf(disk->disk_name, "slram%d", i); 469 - sprintf(disk->devfs_name, "slram/%d", i); 470 469 set_capacity(disk, xpram_sizes[i] << 1); 471 470 add_disk(disk); 472 471 }

-2

include/linux/genhd.h

··· 112 112 sector_t capacity; 113 113 114 114 int flags; 115 - char devfs_name[64]; /* devfs crap */ 116 - int number; /* more of the same */ 117 115 struct device *driverfs_dev; 118 116 struct kobject kobj; 119 117 struct kobject *holder_dir;