asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sd/ide-disk: apply extended minors to sd and ide

Browse source 
Update sd and ide-disk such that they can take advantage of extended
minors.

ide-disk already has 64 minors per device and currently doesn't use
extended minors although after this patch it can be turned on by
simply tweaking constants.

sd only had 16 minors per device causing problems on certain peculiar
configurations.  This patch lifts the restriction and enables it to
use upto 64 minors.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Tejun Heo 2008-08-25 19:47:24 +09:00 committed by Jens Axboe
parent 1f0142905d
commit f615b48cc7
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/ide/ide-disk.c
View file

@ -41,6 +41,10 @@
#include <asm/io.h>
#include <asm/div64.h>
#define IDE_DISK_PARTS (1 << PARTN_BITS)
#define IDE_DISK_MINORS IDE_DISK_PARTS
#define IDE_DISK_EXT_MINORS (IDE_DISK_PARTS - IDE_DISK_MINORS)
struct ide_disk_obj {
ide_drive_t *drive;
ide_driver_t *driver;
@ -1151,7 +1155,7 @@ static int ide_disk_probe(ide_drive_t *drive)
if (!idkp)
goto failed;
g = alloc_disk_node(1 << PARTN_BITS,
g = alloc_disk_ext_node(IDE_DISK_MINORS, IDE_DISK_EXT_MINORS,
hwif_to_node(drive->hwif));
if (!g)
goto out_free_idkp;
@ -1178,7 +1182,8 @@ static int ide_disk_probe(ide_drive_t *drive)
} else
drive->attach = 1;
g->minors = 1 << PARTN_BITS;
g->minors = IDE_DISK_MINORS;
g->ext_minors = IDE_DISK_EXT_MINORS;
g->driverfs_dev = &drive->gendev;
g->flags = drive->removable ? GENHD_FL_REMOVABLE : 0;
set_capacity(g, idedisk_capacity(drive));

9
drivers/scsi/sd.c
View file

@ -86,6 +86,10 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_DISK);
MODULE_ALIAS_SCSI_DEVICE(TYPE_MOD);
MODULE_ALIAS_SCSI_DEVICE(TYPE_RBC);
#define SD_PARTS 64
#define SD_MINORS 16
#define SD_EXT_MINORS (SD_PARTS - SD_MINORS)
static int sd_revalidate_disk(struct gendisk *);
static int sd_probe(struct device *);
static int sd_remove(struct device *);
@ -1801,7 +1805,7 @@ static int sd_probe(struct device *dev)
if (!sdkp)
goto out;
gd = alloc_disk(16);
gd = alloc_disk_ext(SD_MINORS, SD_EXT_MINORS);
if (!gd)
goto out_free;
@ -1845,7 +1849,8 @@ static int sd_probe(struct device *dev)
gd->major = sd_major((index & 0xf0) >> 4);
gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
gd->minors = 16;
gd->minors = SD_MINORS;
gd->ext_minors = SD_EXT_MINORS;
gd->fops = &sd_fops;
if (index < 26) {