Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mmc: Avoid re-using minor numbers before the original device is closed.

Browse source 
Move the code which marks the minor number as free to mmc_blk_put() so
that it happens on the final close() (or removal), instead of doing it
at removal even when the device is still logically open.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
David Woodhouse 2007-11-21 18:45:12 +01:00 committed by Pierre Ossman
parent b37a05069b
commit 1dff314451
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/mmc/card/block.c
View file

@ -44,6 +44,9 @@
* max 8 partitions per card * max 8 partitions per card
*/ */
#define MMC_SHIFT 3 #define MMC_SHIFT 3
#define MMC_NUM_MINORS (256 >> MMC_SHIFT)
static unsigned long dev_use[MMC_NUM_MINORS/(8*sizeof(unsigned long))];
/* /*
* There is one mmc_blk_data per slot. * There is one mmc_blk_data per slot.
@ -80,6 +83,9 @@ static void mmc_blk_put(struct mmc_blk_data *md)
mutex_lock(&open_lock); mutex_lock(&open_lock);
md->usage--; md->usage--;
if (md->usage == 0) { if (md->usage == 0) {
int devidx = md->disk->first_minor >> MMC_SHIFT;
__clear_bit(devidx, dev_use);
put_disk(md->disk); put_disk(md->disk);
kfree(md); kfree(md);
} }
@ -406,9 +412,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
return 0; return 0;
} }
#define MMC_NUM_MINORS (256 >> MMC_SHIFT)
static unsigned long dev_use[MMC_NUM_MINORS/(8*sizeof(unsigned long))];
static inline int mmc_blk_readonly(struct mmc_card *card) static inline int mmc_blk_readonly(struct mmc_card *card)
{ {
@ -574,17 +577,12 @@ static void mmc_blk_remove(struct mmc_card *card)
struct mmc_blk_data *md = mmc_get_drvdata(card); struct mmc_blk_data *md = mmc_get_drvdata(card);
if (md) { if (md) {
int devidx;
/* Stop new requests from getting into the queue */ /* Stop new requests from getting into the queue */
del_gendisk(md->disk); del_gendisk(md->disk);
/* Then flush out any already in there */ /* Then flush out any already in there */
mmc_cleanup_queue(&md->queue); mmc_cleanup_queue(&md->queue);
devidx = md->disk->first_minor >> MMC_SHIFT;
__clear_bit(devidx, dev_use);
mmc_blk_put(md); mmc_blk_put(md);
} }
mmc_set_drvdata(card, NULL); mmc_set_drvdata(card, NULL);