Messages in this thread Patch in this message | | | Date | Sun, 30 Oct 2005 00:39:58 +0200 | From | Pierre Ossman <> | Subject | Re: [PATCH] [MMC] Use command class to determine read-only status. |
| |
Russell King wrote: > On Fri, Oct 28, 2005 at 09:36:05AM +0200, Pierre Ossman wrote: >> If a card doesn't support the "write block" command class then >> any attempts to open the device should reflect this by denying >> write access. > > I'd rather we kept printk messages as one printk if at all possible. > How about encapsulating both of these conditions into an inline > function: >
Ok with me. New patch included. [MMC] Use command class to determine read-only status.
If a card doesn't support the "write block" command class then any attempts to open the device should reflect this by denying write access.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> ---
drivers/mmc/mmc_block.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c --- a/drivers/mmc/mmc_block.c +++ b/drivers/mmc/mmc_block.c @@ -85,6 +85,12 @@ static void mmc_blk_put(struct mmc_blk_d up(&open_lock); } +static inline int mmc_blk_readonly(struct mmc_card *card) +{ + return mmc_card_readonly(card) || + !(card->csd.cmdclass & CCC_BLOCK_WRITE); +} + static int mmc_blk_open(struct inode *inode, struct file *filp) { struct mmc_blk_data *md; @@ -97,7 +103,7 @@ static int mmc_blk_open(struct inode *in ret = 0; if ((filp->f_mode & FMODE_WRITE) && - mmc_card_readonly(md->queue.card)) + mmc_blk_readonly(md->queue.card)) ret = -EROFS; } @@ -410,7 +416,7 @@ static int mmc_blk_probe(struct mmc_card printk(KERN_INFO "%s: %s %s %dKiB %s\n", md->disk->disk_name, mmc_card_id(card), mmc_card_name(card), (card->csd.capacity << card->csd.read_blkbits) / 1024, - mmc_card_readonly(card)?"(ro)":""); + mmc_blk_readonly(card)?"(ro)":""); mmc_set_drvdata(card, md); add_disk(md->disk); | |