commit 5d9a54b66584bdae90e88198ce763702545a68e7
author Al Viro <viro@zeniv.linux.org.uk> Sun Mar 02 10:31:38 2008 -0500
committer Al Viro <viro@zeniv.linux.org.uk> Tue Oct 21 07:48:33 2008 -0400
tree 3a9ea0698ee5f9fa6335f0b5b17b76d90d9e5ca2
parent a39907fa2fdb73d3c0fb06eff06d855c3298d707

[PATCH] switch memstick

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

drivers/memstick/core/mspro_block.c

diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index fbe5919..7911151 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -172,9 +172,9 @@
 
 /*** 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;
 	int rc = -ENXIO;
 
@@ -182,7 +182,7 @@
 
 	if (msb && msb->card) {
 		msb->usage_count++;
-		if ((filp->f_mode & FMODE_WRITE) && msb->read_only)
+		if ((mode & FMODE_WRITE) && msb->read_only)
 			rc = -EROFS;
 		else
 			rc = 0;
@@ -218,9 +218,8 @@
 	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);
 }
 
@@ -237,8 +236,8 @@
 }
 
 static struct block_device_operations ms_block_bdops = {
-	.__open    = mspro_block_bd_open,
-	.__release = mspro_block_bd_release,
+	.open    = mspro_block_bd_open,
+	.release = mspro_block_bd_release,
 	.getgeo  = mspro_block_bd_getgeo,
 	.owner   = THIS_MODULE
 };