diff options
author | Colin Cross <ccross@android.com> | 2011-11-20 09:53:34 +0800 |
---|---|---|
committer | Andy Green <andy.green@linaro.org> | 2011-11-20 10:18:03 +0800 |
commit | 46db1fc46302920ed538ef97b00f224d2eefa65f (patch) | |
tree | d3d42bc6c2b1d6fc1c1e7bbe297ebc4b977c99f8 /drivers | |
parent | 359228159545c3ddc932c8eacd35099f87d4cb01 (diff) |
mmc_block: Allow more than 8 partitions per card
Set the GENHD_FL_EXT_DEVT flag, which will allocate minor numbers
in major 259 for partitions past disk->minors.
Also remove the use of disk_devt to determine devidx from md->disk.
md->disk->first_minor is always initialized from devidx and can
always be used to recover it.
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mmc/card/block.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 1df87c212e7..4c4824a0b53 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -141,11 +141,7 @@ static struct mmc_blk_data *mmc_blk_get(struct gendisk *disk) static inline int mmc_get_devidx(struct gendisk *disk) { - int devmaj = MAJOR(disk_devt(disk)); - int devidx = MINOR(disk_devt(disk)) / perdev_minors; - - if (!devmaj) - devidx = disk->first_minor / perdev_minors; + int devidx = disk->first_minor / perdev_minors; return devidx; } @@ -1409,6 +1405,7 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, md->disk->queue = md->queue.queue; md->disk->driverfs_dev = parent; set_disk_ro(md->disk, md->read_only || default_ro); + md->disk->flags = GENHD_FL_EXT_DEVT; /* * As discussed on lkml, GENHD_FL_REMOVABLE should: |