openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] switch memstick 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2008-03-02 10:31:38 -05:00
parent a39907fa2f
commit 5d9a54b665
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/memstick/core/mspro_block.c
View File

@ -172,9 +172,9 @@ static int mspro_block_complete_req(struct memstick_dev *card, int error);
/*** Block device ***/ /*** Block device ***/
static int mspro_block_bd_open(struct inode *inode, struct file *filp) static int mspro_block_bd_open(struct block_device *bdev, fmode_t mode)
{ {
struct gendisk *disk = inode->i_bdev->bd_disk; struct gendisk *disk = bdev->bd_disk;
struct mspro_block_data *msb = disk->private_data; struct mspro_block_data *msb = disk->private_data;
int rc = -ENXIO; int rc = -ENXIO;
@ -182,7 +182,7 @@ static int mspro_block_bd_open(struct inode *inode, struct file *filp)
if (msb && msb->card) { if (msb && msb->card) {
msb->usage_count++; msb->usage_count++;
if ((filp->f_mode & FMODE_WRITE) && msb->read_only) if ((mode & FMODE_WRITE) && msb->read_only)
rc = -EROFS; rc = -EROFS;
else else
rc = 0; rc = 0;
@ -218,9 +218,8 @@ static int mspro_block_disk_release(struct gendisk *disk)
return 0; return 0;
} }
static int mspro_block_bd_release(struct inode *inode, struct file *filp) static int mspro_block_bd_release(struct gendisk *disk, fmode_t mode)
{ {
struct gendisk *disk = inode->i_bdev->bd_disk;
return mspro_block_disk_release(disk); return mspro_block_disk_release(disk);
} }
@ -237,8 +236,8 @@ static int mspro_block_bd_getgeo(struct block_device *bdev,
} }
static struct block_device_operations ms_block_bdops = { static struct block_device_operations ms_block_bdops = {
.__open = mspro_block_bd_open, .open = mspro_block_bd_open,
.__release = mspro_block_bd_release, .release = mspro_block_bd_release,
.getgeo = mspro_block_bd_getgeo, .getgeo = mspro_block_bd_getgeo,
.owner = THIS_MODULE .owner = THIS_MODULE
}; };