Patch for sparse block minors (RFC)
Subsystems (17)
Here comes the second iteration of my largely pointless excercise in giving ub 64 partitions.
This patch is being a victim of "since you're touching this ANYWAY, so why don't you...". Strictly speaking, there's no need to kill first_minor for the patch to work, but oh well. Ask and ye shall receive.
This version does not touch sd! The reason is, someone clever used up all the minor bits before I was able to grab them, so I'm still thinking how to do it best, if at all. Current layout is:
/*
* Device no to disk mapping:
*
* major disc2 disc p1
* |............|.............|....|....| <- dev_t
* 31 20 19 8 7 4 3 0
*
* Inside a major, we have 16k disks, however mapped non-
* contiguously. The first 16 disks are for major0, the next
* ones with major1, ... Disk 256 is for major0 again, disk 272
* for major1, ...
* As we stay compatible with our numbering scheme, we can reuse
* the well-know SCSI majors 8, 65--71, 136--143.
*/
So, if I want to give sd the ub treatment, the only option is to use bits 18 and 19. It is not fully compatible, but I am sure that nobody has those bits stored on disk already... Or do they?!
The patch is tested to work more or less. Nautilus works, udev works, fdisk works. Open-close-rmmod stress test seems to pass, though it's not a guarantee. If anyone sees locking irregularities, please holler.
-- Pete
arch/um/drivers/ubd_kern.c +1 -2
@@ -635,8 +635,7 @@ static int ubd_new_disk(int major, u64 sif (disk ==NULL )return (-ENOMEM ); - disk->major = major; - disk->first_minor = unit <<UBD_SHIFT ; + disk->gd_dev =MKDEV (major, unit <<UBD_SHIFT ); disk->fops = &ubd_blops;set_capacity (disk, size /512 );if (major ==MAJOR_NR ){
block/genhd.c +48 -20
140 lines not on this page · raw message
block/ioctl.c +1 -1
@@ -69,7 +69,7 @@ static int blkpg_ioctl(struct block_devireturn -ENXIO ;if (disk->part[part -1 ]->nr_sects ==0 )return -ENXIO ; - bdevp =bdget_disk (disk, part); + bdevp =bdget (disk->part[part-1 ]->dev);if (!bdevp)return -ENOMEM ;mutex_lock (&bdevp->bd_mutex);
Documentation/devices.txt +4 -4
@@ -2565,10 +2565,10 @@ Your cooperation is appreciated. 243 = /dev/usb/dabusb3 Fourth dabusb device 180 block USB block devices - 0 = /dev/uba First USB block device - 8 = /dev/ubb Second USB block device - 16 = /dev/ubc Thrid USB block device - ... + 0 = /dev/uba First USB block device + 8 = /dev/ubb Second USB block device + 16 = /dev/ubc Third USB block device + ... 181 char Conrad Electronic parallel port radio clocks 0 = /dev/pcfclock0 First Conrad radio clock
drivers/acorn/block/fd1772.c +1 -2
@@ -1568,8 +1568,7 @@ int fd1772_init(void)for (i =0 ; i <FD_MAX_UNITS ; i++) { unit[i].track =-1 ; - disks[i]->major =MAJOR_NR ; - disks[i]->first_minor =0 ; + disks[i]->gd_dev =MKDEV (MAJOR_NR ,0 ); disks[i]->fops = &floppy_fops;sprintf (disks[i]->disk_name,"fd%d" , i); disks[i]->private_data = &unit[i];
drivers/acorn/block/mfmhd.c +1 -2
@@ -1270,8 +1270,7 @@ static int mfm_do_init(unsigned char irqstruct gendisk *disk =alloc_disk (64 );if (!disk) goto Enomem; - disk->major =MAJOR_NR ; - disk->first_minor = i <<6 ; + disk->gd_dev =MKDEV (MAJOR_NR , i <<6 ); disk->fops = &mfm_fops;sprintf (disk->disk_name,"mfm%c" ,'a' +i); mfm_gendisk[i] = disk;
drivers/block/acsi.c +1 -2
@@ -1733,8 +1733,7 @@ int acsi_init( void )sprintf (disk->disk_name,"ad%c" ,'a' +i); aip = &acsi_info[NDevices];sprintf (disk->devfs_name,"ad/target%d/lun%d" , aip->target, aip->lun); - disk->major =ACSI_MAJOR ; - disk->first_minor = i <<4 ; + disk->gd_dev =MKDEV (ACSI_MAJOR , i <<4 );if (acsi_info[i].type !=HARDDISK ) { disk->minors =1 ;strcat (disk->devfs_name,"/disc" );
drivers/block/amiflop.c +1 -2
@@ -1680,8 +1680,7 @@ static int __init fd_probe_drives(void) nomem =1 ; }printk ("fd%d " ,drive); - disk->major =FLOPPY_MAJOR ; - disk->first_minor = drive; + disk->gd_dev =MKDEV (FLOPPY_MAJOR , drive); disk->fops = &floppy_fops;sprintf (disk->disk_name,"fd%d" , drive); disk->private_data = &unit[drive];
drivers/block/aoe/aoeblk.c +1 -2
@@ -224,8 +224,7 @@ aoeblk_gdalloc(void *vp)spin_lock_irqsave (&d->lock, flags);blk_queue_make_request (&d->blkq, aoeblk_make_request); - gd->major =AOE_MAJOR ; - gd->first_minor = d->sysminor *AOE_PARTITIONS ; + gd->gd_dev =MKDEV (AOE_MAJOR , d->sysminor *AOE_PARTITIONS ); gd->fops = &aoe_bdops; gd->private_data = d; gd->capacity = d->ssize;
drivers/block/aoe/aoecmd.c +1 -1
@@ -380,7 +380,7 @@ aoecmd_sleepwork(void *vp)u64 ssize; ssize = d->gd->capacity; - bd =bdget_disk (d->gd,0 ); + bd =bdget_disk (d->gd);if (bd) {mutex_lock (&bd->bd_inode->i_mutex);
drivers/block/ataflop.c +1 -2
@@ -1923,8 +1923,7 @@ static int __init atari_floppy_init (voifor (i =0 ; i <FD_MAX_UNITS ; i++) { unit[i].track =-1 ; unit[i].flags =0 ; - unit[i].disk->major =FLOPPY_MAJOR ; - unit[i].disk->first_minor = i; + unit[i].disk->gd_dev =MKDEV (FLOPPY_MAJOR , i);sprintf (unit[i].disk->disk_name,"fd%d" , i); unit[i].disk->fops = &floppy_fops; unit[i].disk->private_data = &unit[i];
drivers/block/cciss.c +1 -2
@@ -3232,8 +3232,7 @@ static int __devinit cciss_init_one(stru q->queuedata = hba[i];sprintf (disk->disk_name,"cciss/c%dd%d" , i, j);sprintf (disk->devfs_name,"cciss/host%d/target%d" , i, j); - disk->major = hba[i]->major; - disk->first_minor = j <<NWD_SHIFT ; + disk->gd_dev =MKDEV (hba[i]->major, j <<NWD_SHIFT ); disk->fops = &cciss_fops; disk->queue = q; disk->private_data = drv;
drivers/block/cpqarray.c +1 -2
@@ -474,8 +474,7 @@ static int cpqarray_register_ctlr( int istruct gendisk *disk = ida_gendisk[i][j];drv_info_t *drv = &hba[i]->drv[j];sprintf (disk->disk_name,"ida/c%dd%d" , i, j); - disk->major =COMPAQ_SMART2_MAJOR + i; - disk->first_minor = j<<NWD_SHIFT ; + disk->gd_dev =MKDEV (COMPAQ_SMART2_MAJOR + i, j<<NWD_SHIFT ); disk->fops = &ida_fops;if (j && !drv->nr_blks)continue ;
drivers/block/DAC960.c +1 -2
@@ -2531,8 +2531,7 @@ static boolean DAC960_RegisterBlockDevic disk->queue = RequestQueue;sprintf (disk->disk_name,"rd/c%dd%d" , Controller->ControllerNumber, n);sprintf (disk->devfs_name,"rd/host%d/target%d" , Controller->ControllerNumber, n); - disk->major = MajorNumber; - disk->first_minor = n << DAC960_MaxPartitionsBits; + disk->gd_dev =MKDEV (MajorNumber, n << DAC960_MaxPartitionsBits); disk->fops = &DAC960_BlockDeviceOperations; }/*
drivers/block/floppy.c +1 -2
@@ -4251,8 +4251,7 @@ static int __init floppy_init(void) goto out_put_disk; } - disks[dr]->major =FLOPPY_MAJOR ; - disks[dr]->first_minor =TOMINOR (dr); + disks[dr]->gd_dev =MKDEV (FLOPPY_MAJOR ,TOMINOR (dr)); disks[dr]->fops = &floppy_fops;sprintf (disks[dr]->disk_name,"fd%d" , dr);
drivers/block/loop.c +1 -2
@@ -1292,8 +1292,7 @@ static int __init loop_init(void)init_completion (&lo->lo_bh_done); lo->lo_number = i;spin_lock_init (&lo->lo_lock); - disk->major =LOOP_MAJOR ; - disk->first_minor = i; + disk->gd_dev =MKDEV (LOOP_MAJOR , i); disk->fops = &lo_fops;sprintf (disk->disk_name,"loop%d" , i);sprintf (disk->devfs_name,"loop/%d" , i);
drivers/block/nbd.c +1 -2
@@ -684,8 +684,7 @@ static int __init nbd_init(void)init_waitqueue_head (&nbd_dev[i].active_wq); nbd_dev[i].blksize =1024 ; nbd_dev[i].bytesize =0x7ffffc00ULL <<10 ;/* 2TB */ - disk->major =NBD_MAJOR ; - disk->first_minor = i; + disk->gd_dev =MKDEV (NBD_MAJOR , i); disk->fops = &nbd_fops; disk->private_data = &nbd_dev[i]; disk->flags |=GENHD_FL_SUPPRESS_PARTITION_INFO ;
drivers/block/paride/pcd.c +1 -2
@@ -299,8 +299,7 @@ static void pcd_init_units(void) cd->info.speed =0 ; cd->info.capacity =1 ; cd->info.mask =0 ; - disk->major = major; - disk->first_minor = unit; + disk->gd_dev =MKDEV (major, unit);strcpy (disk->disk_name, cd->name);/* umm... */ disk->fops = &pcd_bdops; }
drivers/block/paride/pd.c +1 -2
@@ -831,8 +831,7 @@ static void pd_probe_drive(struct pd_unireturn ;strcpy (p->disk_name, disk->name); p->fops = &pd_fops; - p->major = major; - p->first_minor = (disk - pd) <<PD_BITS ; + p->gd_dev =MKDEV (major, (disk - pd) <<PD_BITS ); disk->gd = p; p->private_data = disk; p->queue = pd_queue;
drivers/block/paride/pf.c +1 -2
@@ -287,8 +287,7 @@ static void __init pf_init_units(void) pf->drive = (*drives[unit])[D_SLV ]; pf->lun = (*drives[unit])[D_LUN ];snprintf (pf->name,PF_NAMELEN ,"%s%d" , name, unit); - disk->major = major; - disk->first_minor = unit; + disk->gd_dev =MKDEV (major, unit);strcpy (disk->disk_name, pf->name); disk->fops = &pf_fops;if (!(*drives[unit])[D_PRT ])
drivers/block/pktcdvd.c +2 -3
@@ -2475,8 +2475,7 @@ static int pkt_setup_dev(struct pkt_ctrlinit_waitqueue_head (&pd->wqueue); pd->bio_queue =RB_ROOT ; - disk->major = pkt_major; - disk->first_minor = idx; + disk->gd_dev =MKDEV (pkt_major, idx); disk->fops = &pktcdvd_ops; disk->flags =GENHD_FL_REMOVABLE ;sprintf (disk->disk_name,"pktcdvd%d" , idx);
@@ -2485,7 +2484,7 @@ static int pkt_setup_dev(struct pkt_ctrlif (!disk->queue) goto out_mem2; - pd->pkt_dev =MKDEV (disk->major, disk->first_minor); + pd->pkt_dev = disk->gd_dev; ret =pkt_new_dev (pd, dev);if (ret) goto out_new_dev;
drivers/block/ps2esdi.c +1 -2
@@ -418,8 +418,7 @@ static int __init ps2esdi_geninit(void)struct gendisk *disk =alloc_disk (64 );if (!disk) goto err_out4; - disk->major =PS2ESDI_MAJOR ; - disk->first_minor = i<<6 ; + disk->gd_dev =MKDEV (PS2ESDI_MAJOR , i<<6 );sprintf (disk->disk_name,"ed%c" ,'a' +i);sprintf (disk->devfs_name,"ed/target%d" , i); disk->fops = &ps2esdi_fops;
drivers/block/rd.c +1 -2
@@ -455,8 +455,7 @@ static int __init rd_init(void)blk_queue_hardsect_size (rd_queue[i], rd_blocksize);/* rd_size is given in kB */ - disk->major =RAMDISK_MAJOR ; - disk->first_minor = i; + disk->gd_dev =MKDEV (RAMDISK_MAJOR , i); disk->fops = &rd_bd_op; disk->queue = rd_queue[i]; disk->flags |=GENHD_FL_SUPPRESS_PARTITION_INFO ;
drivers/block/swim3.c +1 -2
@@ -1057,8 +1057,7 @@ int swim3_init(void)for (i =0 ; i < floppy_count; i++) {struct gendisk *disk = disks[i]; - disk->major =FLOPPY_MAJOR ; - disk->first_minor = i; + disk->gd_dev =MKDEV (FLOPPY_MAJOR , i); disk->fops = &floppy_fops; disk->private_data = &floppy_states[i]; disk->queue = swim3_queue;
drivers/block/swim_iop.c +1 -2
@@ -193,8 +193,7 @@ int swimiop_init(void)struct gendisk *disk =alloc_disk (1 );if (!disk)continue ; - disk->major =FLOPPY_MAJOR ; - disk->first_minor = i; + disk->gd_dev =MKDEV (FLOPPY_MAJOR , i); disk->fops = &floppy_fops;sprintf (disk->disk_name,"fd%d" , i); disk->private_data = &floppy_states[i];
drivers/block/sx8.c +1 -2
@@ -1511,8 +1511,7 @@ static int carm_init_disks(struct carm_hsprintf (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 ; + disk->gd_dev =MKDEV (host->major, i *CARM_MINORS_PER_MAJOR ); disk->fops = &carm_bd_ops; disk->private_data = port;
drivers/block/ub.c +122 -15
219 lines not on this page · raw message
drivers/block/umem.c +1 -2
@@ -1194,8 +1194,7 @@ static int __init mm_init(void)sprintf (disk->disk_name,"umem%c" ,'a' +i);sprintf (disk->devfs_name,"umem/card%d" , i);spin_lock_init (&cards[i].lock); - disk->major = major_nr; - disk->first_minor = i <<MM_SHIFT ; + disk->gd_dev =MKDEV (major_nr, i <<MM_SHIFT ); disk->fops = &mm_fops; disk->private_data = &cards[i]; disk->queue = cards[i].queue;
drivers/block/viodasd.c +1 -2
@@ -514,8 +514,7 @@ retry:blk_queue_max_hw_segments (q,VIOMAXBLOCKDMA );blk_queue_max_phys_segments (q,VIOMAXBLOCKDMA );blk_queue_max_sectors (q,VIODASD_MAXSECTORS ); - g->major =VIODASD_MAJOR ; - g->first_minor = dev_no <<PARTITION_SHIFT ; + g->gd_dev =MKDEV (VIODASD_MAJOR , dev_no <<PARTITION_SHIFT );if (dev_no >=26 ) snprintf(g->disk_name, sizeof(g->disk_name), VIOD_GENHD_NAME "%c%c",
drivers/block/xd.c +1 -2
@@ -212,8 +212,7 @@ static int __init xd_init(void)if (!disk) goto Enomem; p->unit = i; - disk->major =XT_DISK_MAJOR ; - disk->first_minor = i<<6 ; + disk->gd_dev =MKDEV (XT_DISK_MAJOR , i<<6 );sprintf (disk->disk_name,"xd%c" , i+'a' );sprintf (disk->devfs_name,"xd/target%d" , i); disk->fops = &xd_fops;
drivers/block/z2ram.c +1 -2
@@ -350,8 +350,7 @@ z2_init(void)if (!z2_queue) goto out_queue; - z2ram_gendisk->major =Z2RAM_MAJOR ; - z2ram_gendisk->first_minor =0 ; + z2ram_gendisk->gd_dev =MKDEV (Z2RAM_MAJOR ,0 ); z2ram_gendisk->fops = &z2_fops;sprintf (z2ram_gendisk->disk_name,"z2ram" );strcpy (z2ram_gendisk->devfs_name, z2ram_gendisk->disk_name);
drivers/cdrom/aztcd.c +1 -2
@@ -1914,8 +1914,7 @@ static int __init aztcd_init(void) }blk_queue_hardsect_size (azt_queue,2048 ); - azt_disk->major =MAJOR_NR ; - azt_disk->first_minor =0 ; + azt_disk->gd_dev =MKDEV (MAJOR_NR ,0 ); azt_disk->fops = &azt_fops;sprintf (azt_disk->disk_name,"aztcd" );sprintf (azt_disk->devfs_name,"aztcd" );
drivers/cdrom/cdu31a.c +1 -2
@@ -3123,8 +3123,7 @@ int __init cdu31a_init(void) disk =alloc_disk (1 );if (!disk) goto errout1; - disk->major =MAJOR_NR ; - disk->first_minor =0 ; + disk->gd_dev =MKDEV (MAJOR_NR ,0 );sprintf (disk->disk_name,"cdu31a" ); disk->fops = &scd_bdops; disk->flags =GENHD_FL_CD ;
drivers/cdrom/cm206.c +1 -2
@@ -1471,8 +1471,7 @@ int __init cm206_init(void) disk =alloc_disk (1 );if (!disk) goto out_disk; - disk->major =MAJOR_NR ; - disk->first_minor =0 ; + disk->gd_dev =MKDEV (MAJOR_NR ,0 );sprintf (disk->disk_name,"cm206cd" ); disk->fops = &cm206_bdops; disk->flags =GENHD_FL_CD ;
drivers/cdrom/gscd.c +1 -2
@@ -951,8 +951,7 @@ static int __init gscd_init(void) gscd_disk =alloc_disk (1 );if (!gscd_disk) goto err_out1; - gscd_disk->major =MAJOR_NR ; - gscd_disk->first_minor =0 ; + gscd_disk->gd_dev =MKDEV (MAJOR_NR ,0 ); gscd_disk->fops = &gscd_fops;sprintf (gscd_disk->disk_name,"gscd" );sprintf (gscd_disk->devfs_name,"gscd" );
drivers/cdrom/mcdx.c +1 -2
@@ -1227,8 +1227,7 @@ static int __init mcdx_init_drive(int dr stuffp->info.capacity =1 ; stuffp->info.handle = stuffp;sprintf (stuffp->info.name,"mcdx%d" , drive); - disk->major =MAJOR_NR ; - disk->first_minor = drive; + disk->gd_dev =MKDEV (MAJOR_NR , drive);strcpy (disk->disk_name, stuffp->info.name); disk->fops = &mcdx_bdops; disk->flags =GENHD_FL_CD ;
drivers/cdrom/optcd.c +1 -2
@@ -2029,8 +2029,7 @@ static int __init optcd_init(void)printk (KERN_ERR "optcd: can't allocate disk\n" );return -ENOMEM ; } - optcd_disk->major =MAJOR_NR ; - optcd_disk->first_minor =0 ; + optcd_disk->gd_dev =MKDEV (MAJOR_NR ,0 ); optcd_disk->fops = &opt_fops;sprintf (optcd_disk->disk_name,"optcd" );sprintf (optcd_disk->devfs_name,"optcd" );
drivers/cdrom/sbpcd.c +1 -2
@@ -5866,8 +5866,7 @@ int __init sbpcd_init(void) sbpcd_infop->handle = p; p->sbpcd_infop = sbpcd_infop; disk =alloc_disk (1 ); - disk->major =MAJOR_NR ; - disk->first_minor = j; + disk->gd_dev =MKDEV (MAJOR_NR , j); disk->fops = &sbpcd_bdops;strcpy (disk->disk_name, sbpcd_infop->name); disk->flags =GENHD_FL_CD ;
drivers/cdrom/sjcd.c +1 -2
@@ -1691,8 +1691,7 @@ static int __init sjcd_init(void)printk (KERN_ERR "SJCD: can't allocate disk" ); goto out1; } - sjcd_disk->major =MAJOR_NR , - sjcd_disk->first_minor =0 , + sjcd_disk->gd_dev =MKDEV (MAJOR_NR ,0 ); sjcd_disk->fops = &sjcd_fops,sprintf (sjcd_disk->disk_name,"sjcd" );sprintf (sjcd_disk->devfs_name,"sjcd" );
drivers/cdrom/sonycd535.c +1 -2
@@ -1585,8 +1585,7 @@ static int __init sony535_init(void) cdu_disk =alloc_disk (1 );if (!cdu_disk) goto out6; - cdu_disk->major =MAJOR_NR ; - cdu_disk->first_minor =0 ; + cdu_disk->gd_dev =MKDEV (MAJOR_NR ,0 ); cdu_disk->fops = &cdu_fops;sprintf (cdu_disk->disk_name,"cdu" );sprintf (cdu_disk->devfs_name,"cdu535" );
drivers/cdrom/viocd.c +1 -2
@@ -684,8 +684,7 @@ static int viocd_probe(struct vio_dev *v c->name); goto out_cleanup_queue; } - gendisk->major =VIOCD_MAJOR ; - gendisk->first_minor = deviceno; + gendisk->gd_dev =MKDEV (VIOCD_MAJOR , deviceno);strncpy (gendisk->disk_name, c->name,sizeof (gendisk->disk_name)); snprintf(gendisk->devfs_name, sizeof(gendisk->devfs_name),
drivers/char/random.c +2 -3
@@ -661,10 +661,9 @@ void add_disk_randomness(struct gendiskif (!disk || !disk->random)return ;/* first major is 1, so we get >= 0x200 here */ -DEBUG_ENT ("disk event %d:%d\n" , disk->major, disk->first_minor); +DEBUG_ENT ("disk event %d:%d\n" ,MAJOR (disk->gd_dev),MINOR (disk->gd_dev)); -add_timer_randomness (disk->random, -0x100 +MKDEV (disk->major, disk->first_minor)); +add_timer_randomness (disk->random,0x100 + disk->gd_dev); }EXPORT_SYMBOL (add_disk_randomness);
drivers/ide/ide-probe.c +3 -5
@@ -1224,7 +1224,7 @@ static int exact_lock(dev_t dev, void *dvoid ide_register_region (struct gendisk *disk) { -blk_register_region (MKDEV (disk->major, disk->first_minor), +blk_register_region (disk->gd_dev, disk->minors,NULL , exact_match, exact_lock, disk); }
@@ -1232,8 +1232,7 @@ EXPORT_SYMBOL_GPL(ide_register_region);void ide_unregister_region (struct gendisk *disk) { -blk_unregister_region (MKDEV (disk->major, disk->first_minor), - disk->minors); +blk_unregister_region (disk->gd_dev, disk->minors); }EXPORT_SYMBOL_GPL (ide_unregister_region);
@@ -1243,8 +1242,7 @@ void ide_init_disk(struct gendisk *disk,ide_hwif_t *hwif = drive->hwif;unsigned int unit = (drive->select.all >>4 ) &1 ; - disk->major = hwif->major; - disk->first_minor = unit <<PARTN_BITS ; + disk->gd_dev =MKDEV (hwif->major, unit <<PARTN_BITS );sprintf (disk->disk_name,"hd%c" ,'a' + hwif->index *MAX_DRIVES + unit); disk->queue = drive->queue; }
drivers/ide/legacy/hd.c +1 -2
@@ -792,8 +792,7 @@ static int __init hd_init(void)struct hd_i_struct *p = &hd_info[drive];if (!disk) goto Enomem; - disk->major =MAJOR_NR ; - disk->first_minor = drive <<6 ; + disk->gd_dev =MKDEV (MAJOR_NR , drive <<6 ); disk->fops = &hd_fops;sprintf (disk->disk_name,"hd%c" ,'a' +drive); disk->private_data = p;
drivers/md/dm.c +4 -5
@@ -875,8 +875,7 @@ static struct mapped_device *alloc_dev(uif (!md->disk) goto bad4; - md->disk->major = _major; - md->disk->first_minor = minor; + md->disk->gd_dev =MKDEV (_major, minor); md->disk->fops = &dm_blk_dops; md->disk->queue = md->queue; md->disk->private_data = md;
@@ -904,7 +903,7 @@ static struct mapped_device *alloc_dev(ustatic void free_dev (struct mapped_device *md) { -unsigned int minor = md->disk->first_minor; +unsigned int minor =MINOR (md->disk->gd_dev);if (md->suspended_bdev) {thaw_bdev (md->suspended_bdev,NULL );
@@ -1018,7 +1017,7 @@ static struct mapped_device *dm_find_md(mutex_lock (&_minor_lock); md =idr_find (&_minor_idr, minor); -if (!md || (dm_disk (md)->first_minor != minor)) +if (!md || (MINOR (dm_disk (md)->gd_dev) != minor)) md =NULL ;mutex_unlock (&_minor_lock);
@@ -1162,7 +1161,7 @@ int dm_suspend(struct mapped_device *md,/* This does not get reverted if there's an error later. */ dm_table_presuspend_targets (map); - md->suspended_bdev =bdget_disk (md->disk,0 ); + md->suspended_bdev =bdget_disk (md->disk);if (!md->suspended_bdev) {DMWARN ("bdget failed in dm_suspend" ); r = -ENOMEM ;
drivers/md/dm-ioctl.c +4 -4
@@ -173,7 +173,7 @@ static int register_with_devfs(struct ha {struct gendisk *disk =dm_disk (hc->md); -devfs_mk_bdev (MKDEV (disk->major, disk->first_minor), +devfs_mk_bdev (disk->gd_dev,S_IFBLK |S_IRUSR |S_IWUSR |S_IRGRP ,DM_DIR "/%s" , hc->name);return 0 ;
@@ -418,7 +418,7 @@ static int list_devices(struct dm_ioctl old_nl->next = (uint32_t ) ((void *) nl - (void *) old_nl); disk =dm_disk (hc->md); - nl->dev =huge_encode_dev (MKDEV (disk->major, disk->first_minor)); + nl->dev =huge_encode_dev (disk->gd_dev); nl->next =0 ;strcpy (nl->name, hc->name);
@@ -532,10 +532,10 @@ static int __dev_status(struct mapped_deif (dm_suspended (md)) param->flags |=DM_SUSPEND_FLAG ; - param->dev =huge_encode_dev (MKDEV (disk->major, disk->first_minor)); + param->dev =huge_encode_dev (disk->gd_dev);if (!(param->flags &DM_SKIP_BDGET_FLAG )) { - bdev =bdget_disk (disk,0 ); + bdev =bdget_disk (disk);if (!bdev)return -ENXIO ;
drivers/md/md.c +2 -3
@@ -2530,8 +2530,7 @@ static struct kobject *md_probe(dev_t demddev_put (mddev);return NULL ; } - disk->major =MAJOR (dev); - disk->first_minor = unit << shift; + disk->gd_dev = dev + (unit << shift);if (partitioned) {sprintf (disk->disk_name,"md_d%d" , unit);sprintf (disk->devfs_name,"md/d%d" , unit);
@@ -3615,7 +3614,7 @@ static int update_size(mddev_t *mddev, uif (!rv) {struct block_device *bdev; - bdev =bdget_disk (mddev->gendisk,0 ); + bdev =bdget_disk (mddev->gendisk);if (bdev) {mutex_lock (&bdev->bd_inode->i_mutex);i_size_write (bdev->bd_inode, (loff_t )mddev->array_size <<10 );
drivers/md/raid5.c +1 -1
@@ -2720,7 +2720,7 @@ static void end_reshape(raid5_conf_t *coset_capacity (conf->mddev->gendisk, conf->mddev->array_size <<1 ); conf->mddev->changed =1 ; - bdev =bdget_disk (conf->mddev->gendisk,0 ); + bdev =bdget_disk (conf->mddev->gendisk);if (bdev) {mutex_lock (&bdev->bd_inode->i_mutex);i_size_write (bdev->bd_inode, conf->mddev->array_size <<10 );
drivers/message/i2o/i2o_block.c +1 -2
@@ -1010,7 +1010,6 @@ static struct i2o_block_device *i2o_blocblk_queue_prep_rq (queue, i2o_block_prep_req_fn);blk_queue_issue_flush_fn (queue, i2o_block_issue_flush); - gd->major =I2O_MAJOR ; gd->queue = queue; gd->fops = &i2o_block_fops; gd->private_data = dev;
@@ -1087,7 +1086,7 @@ static int i2o_block_probe(struct device/* setup gendisk */ gd = i2o_blk_dev->gd; - gd->first_minor = unit <<4 ; + gd->gd_dev =MKDEV (I2O_MAJOR , unit <<4 );sprintf (gd->disk_name,"i2o/hd%c" ,'a' + unit);sprintf (gd->devfs_name,"i2o/hd%c" ,'a' + unit); gd->driverfs_dev = &i2o_dev->device;
drivers/mmc/mmc_block.c +2 -3
@@ -389,8 +389,7 @@ static struct mmc_blk_data *mmc_blk_allo md->queue.issue_fn = mmc_blk_issue_rq; md->queue.data = md; - md->disk->major = major; - md->disk->first_minor = devidx <<MMC_SHIFT ; + md->disk->gd_dev =MKDEV (major, devidx <<MMC_SHIFT ); md->disk->fops = &mmc_bdops; md->disk->private_data = md; md->disk->queue = md->queue.queue;
@@ -498,7 +497,7 @@ static void mmc_blk_remove(struct mmc_ca*/ md->disk->queue =NULL ; - devidx = md->disk->first_minor >>MMC_SHIFT ; + devidx =MINOR (md->disk->gd_dev) >>MMC_SHIFT ;__clear_bit (devidx, dev_use);mmc_blk_put (md);
drivers/mtd/mtd_blkdevs.c +1 -2
@@ -278,8 +278,7 @@ int add_mtd_blktrans_dev(struct mtd_blktlist_del (&new->list);return -ENOMEM ; } - gd->major = tr->major; - gd->first_minor = (new->devnum) << tr->part_bits; + gd->gd_dev =MKDEV (tr->major, new->devnum << tr->part_bits); gd->fops = &mtd_blktrans_ops;if (tr->part_bits)
drivers/s390/block/dasd_genhd.c +2 -3
@@ -41,8 +41,7 @@ dasd_gendisk_alloc(struct dasd_device *dreturn -ENOMEM ;/* Initialize gendisk structure. */ - gdp->major =DASD_MAJOR ; - gdp->first_minor = device->devindex <<DASD_PARTN_BITS ; + gdp->gd_dev =MKDEV (DASD_MAJOR , device->devindex <<DASD_PARTN_BITS ); gdp->fops = &dasd_device_operations; gdp->driverfs_dev = &device->cdev->dev;
@@ -100,7 +99,7 @@ dasd_scan_partitions(struct dasd_device {struct block_device *bdev; - bdev =bdget_disk (device->gdp,0 ); + bdev =bdget_disk (device->gdp);if (!bdev ||blkdev_get (bdev,FMODE_READ ,1 ) <0 )return -ENODEV ;/*
drivers/s390/block/dasd_ioctl.c +1 -1
@@ -157,7 +157,7 @@ dasd_format(struct dasd_device * device,* enabling the device later. */ if (fdata->start_unit ==0 ) { -struct block_device *bdev =bdget_disk (device->gdp,0 ); +struct block_device *bdev =bdget_disk (device->gdp); bdev->bd_inode->i_blkbits =blksize_bits (fdata->blksize);bdput (bdev); }
drivers/s390/block/dasd_proc.c +2 -1
@@ -68,7 +68,8 @@ dasd_devices_show(struct seq_file *m, vo/* Print kdev. */ if (device->gdp)seq_printf (m," at (%3d:%6d)" , - device->gdp->major, device->gdp->first_minor); +MAJOR (device->gdp->gd_dev), +MINOR (device->gdp->gd_dev));else seq_printf (m," at (???:??????)" );/* Print device name. */
drivers/s390/block/dcssblk.c +3 -4
@@ -114,13 +114,13 @@ dcssblk_assign_free_minor(struct dcssblk found =0 ;// test if minor available list_for_each_entry (entry, &dcssblk_devices, lh) -if (minor == entry->gd->first_minor) +if (minor ==MINOR (entry->gd->gd_dev)) found++;if (!found)break ;// got unused minor }if (found)return -EBUSY ; - dev_info->gd->first_minor = minor; + dev_info->gd->gd_dev =MKDEV (dcssblk_major, minor);return 0 ; }
@@ -404,7 +404,6 @@ dcssblk_add_store(struct device *dev, st rc = -ENOMEM ; goto free_dev_info; } - dev_info->gd->major = dcssblk_major; dev_info->gd->fops = &dcssblk_devops; dev_info->dcssblk_queue =blk_alloc_queue (GFP_KERNEL ); dev_info->gd->queue = dev_info->dcssblk_queue;
@@ -442,7 +441,7 @@ dcssblk_add_store(struct device *dev, st goto unload_seg; }sprintf (dev_info->gd->disk_name,"dcssblk%d" , - dev_info->gd->first_minor); +MINOR (dev_info->gd->gd_dev));list_add_tail (&dev_info->lh, &dcssblk_devices);if (!try_module_get (THIS_MODULE )) {
drivers/s390/block/xpram.c +1 -2
@@ -463,8 +463,7 @@ static int __init xpram_setup_blkdev(voi xpram_devices[i].size = xpram_sizes[i] /4 ; xpram_devices[i].offset = offset; offset += xpram_devices[i].size; - disk->major =XPRAM_MAJOR ; - disk->first_minor = i; + disk->gd_dev =MKDEV (XPRAM_MAJOR , i); disk->fops = &xpram_devops; disk->private_data = &xpram_devices[i]; disk->queue = xpram_queue;
drivers/s390/char/tape_block.c +1 -2
@@ -241,8 +241,7 @@ tapeblock_setup_device(struct tape_devic goto cleanup_queue; } - disk->major = tapeblock_major; - disk->first_minor = device->first_minor; + disk->gd_dev =MKDEV (tapeblock_major, device->first_minor); disk->fops = &tapeblock_fops; disk->private_data =tape_get_device_reference (device); disk->queue = blkdat->request_queue;
drivers/sbus/char/jsflash.c +1 -2
@@ -575,8 +575,7 @@ static int jsfd_init(void) jsf = &jsf0;/* actually, &jsfv[i >> JSF_PART_BITS] */ jdp = &jsf->dv[i&JSF_PART_MASK ]; - disk->major =JSFD_MAJOR ; - disk->first_minor = i; + disk->gd_dev =MKDEV (JSFD_MAJOR , i);sprintf (disk->disk_name,"jsfd%d" , i); disk->fops = &jsfd_fops;set_capacity (disk, jdp->dsize >>9 );
drivers/scsi/sd.c +3 -2
@@ -1611,6 +1611,7 @@ static int sd_probe(struct device *dev)struct scsi_device *sdp =to_scsi_device (dev);struct scsi_disk *sdkp;struct gendisk *gd; +unsigned int major;u32 index;int error;
@@ -1665,8 +1666,8 @@ static int sd_probe(struct device *dev) sdp->timeout =SD_MOD_TIMEOUT ; } - gd->major =sd_major ((index &0xf0 ) >>4 ); - gd->first_minor = ((index &0xf ) <<4 ) | (index &0xfff00 ); + major =sd_major ((index &0xf0 ) >>4 ); + gd->gd_dev =MKDEV (major, ((index &0xf ) <<4 ) | (index &0xfff00 )); gd->minors =16 ; gd->fops = &sd_fops;
drivers/scsi/sg.c +1 -2
@@ -1363,7 +1363,7 @@ static int sg_alloc(struct gendisk *diskSCSI_LOG_TIMEOUT (3 ,printk ("sg_alloc: dev=%d \n" , k));sprintf (disk->disk_name,"sg%d" , k); - disk->first_minor = k; + disk->gd_dev =MKDEV (SCSI_GENERIC_MAJOR , k); sdp->disk = disk; sdp->device = scsidp;init_waitqueue_head (&sdp->o_excl_wait);
@@ -1408,7 +1408,6 @@ sg_add(struct class_device *cl_dev, struprintk (KERN_WARNING "alloc_disk failed\n" );return -ENOMEM ; } - disk->major =SCSI_GENERIC_MAJOR ; error = -ENOMEM ; cdev =cdev_alloc ();
drivers/scsi/sr.c +2 -3
@@ -564,8 +564,7 @@ static int sr_probe(struct device *dev)__set_bit (minor, sr_index_bits);spin_unlock (&sr_index_lock); - disk->major =SCSI_CDROM_MAJOR ; - disk->first_minor = minor; + disk->gd_dev =MKDEV (SCSI_CDROM_MAJOR , minor);sprintf (disk->disk_name,"sr%d" , minor); disk->fops = &sr_bdops; disk->flags =GENHD_FL_CD ;
@@ -853,7 +852,7 @@ static void sr_kref_release(struct krefstruct gendisk *disk = cd->disk;spin_lock (&sr_index_lock); -clear_bit (disk->first_minor, sr_index_bits); +clear_bit (MINOR (disk->gd_dev), sr_index_bits);spin_unlock (&sr_index_lock);unregister_cdrom (&cd->cdi);
fs/block_dev.c +1 -1
@@ -910,7 +910,7 @@ static int do_open(struct block_device * }else {struct hd_struct *p;struct block_device *whole; - whole =bdget_disk (disk,0 ); + whole =bdget_disk (disk); ret = -ENOMEM ;if (!whole) goto out_first;
fs/partitions/check.c +8 -7
@@ -131,7 +131,7 @@ char *disk_name(struct gendisk *hd, intconst char *bdevname (struct block_device *bdev,char *buf) { -int part =MINOR (bdev->bd_dev) - bdev->bd_disk->first_minor; +int part = bdev->bd_dev - bdev->bd_disk->gd_dev;return disk_name (bdev->bd_disk, part, buf); }
@@ -235,9 +235,7 @@ static ssize_t part_uevent_store(struct }static ssize_t part_dev_read (struct hd_struct * p,char *page) { - struct gendisk *disk = container_of(p->kobj.parent,struct gendisk,kobj); -dev_t dev =MKDEV (disk->major, disk->first_minor + p->partno); -return print_dev_t (page, dev); +return print_dev_t (page, p->dev); }static ssize_t part_start_read (struct hd_struct * p,char *page) {
@@ -348,9 +346,12 @@ void add_partition(struct gendisk *disk,memset (p,0 ,sizeof (*p)); p->start_sect = start; p->nr_sects = len; - p->partno = part; +if (disk->fops->partmap) + p->dev = disk->fops->partmap (disk, part); +else + p->dev = disk->gd_dev + part; -devfs_mk_bdev (MKDEV (disk->major, disk->first_minor + part), +devfs_mk_bdev (p->dev,S_IFBLK |S_IRUSR |S_IWUSR ,"%s/part%d" , disk->devfs_name, part);
@@ -436,7 +437,7 @@ void register_disk(struct gendisk *disk)if (!get_capacity (disk)) goto exit; - bdev =bdget_disk (disk,0 ); + bdev =bdget_disk (disk);if (!bdev) goto exit;
fs/partitions/devfs.c +2 -2
@@ -82,7 +82,7 @@ void devfs_add_partitioned(struct gendischar dirname[64 ], symlink[16 ];devfs_mk_dir (disk->devfs_name); -devfs_mk_bdev (MKDEV (disk->major, disk->first_minor), +devfs_mk_bdev (disk->gd_dev,S_IFBLK |S_IRUSR |S_IWUSR ,"%s/disc" , disk->devfs_name);
@@ -96,7 +96,7 @@ void devfs_add_partitioned(struct gendisvoid devfs_add_disk (struct gendisk *disk) { - devfs_mk_bdev(MKDEV(disk->major, disk->first_minor), + devfs_mk_bdev(disk->gd_dev, (disk->flags & GENHD_FL_CD) ? S_IFBLK|S_IRUGO|S_IWUGO : S_IFBLK|S_IRUSR|S_IWUSR,
Only in linux-2.6.17-git7-p/include: asm
include/linux/fs.h +1 -0
@@ -976,6 +976,7 @@ struct block_device_operations {int (*media_changed) (struct gendisk *);int (*revalidate_disk) (struct gendisk *);int (*getgeo)(struct block_device *,struct hd_geometry *); +dev_t (*partmap)(struct gendisk *,int partno);struct module *owner; };
include/linux/genhd.h +7 -6
@@ -80,7 +80,8 @@ struct hd_struct {struct kobject kobj;struct kobject *holder_dir;unsigned ios[2 ], sectors[2 ];/* READs and WRITEs */ -int policy, partno; +int policy; +dev_t dev; };#define GENHD_FL_REMOVABLE 1
@@ -88,6 +89,7 @@ struct hd_struct {#define GENHD_FL_CD 8#define GENHD_FL_UP 16#define GENHD_FL_SUPPRESS_PARTITION_INFO 32 +#define GENHD_FL_SPARSE_MINORS 64struct disk_stats {unsigned long sectors[2 ];/* READs and WRITEs */
@@ -97,10 +99,9 @@ struct disk_stats {unsigned long io_ticks;unsigned long time_in_queue; }; - +struct gendisk { -int major;/* major number of driver */ -int first_minor; +dev_t gd_dev;/* whole device */ int minors;/* maximum number of minors, =1 for * disks that can't be partitioned. */ char disk_name[32 ];/* name of major driver */
@@ -414,9 +415,9 @@ extern void blk_register_region(dev_t de void *data);extern void blk_unregister_region (dev_t dev,unsigned long range); -static inline struct block_device *bdget_disk (struct gendisk *disk,int index) +static inline struct block_device *bdget_disk (struct gendisk *disk) { -return bdget (MKDEV (disk->major, disk->first_minor) + index); +return bdget (disk->gd_dev); }#endif