aboutsummaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-03-02 10:24:45 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2008-10-21 07:48:17 -0400
commitab746cb9386313201f2e0060e85a30781047dee1 (patch)
tree526200d2d25a97fa5909018329a412ad0ab77bc7 /drivers/block
parentf3f68b367389bcbe1823e6e775f4ec32d7d69b40 (diff)
[PATCH] switch z2ram
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/z2ram.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 4860d0f3687..80754cdd311 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -137,8 +137,7 @@ get_chipram( void )
return;
}
-static int
-z2_open( struct inode *inode, struct file *filp )
+static int z2_open(struct block_device *bdev, fmode_t mode)
{
int device;
int max_z2_map = ( Z2RAM_SIZE / Z2RAM_CHUNKSIZE ) *
@@ -147,7 +146,7 @@ z2_open( struct inode *inode, struct file *filp )
sizeof( z2ram_map[0] );
int rc = -ENOMEM;
- device = iminor(inode);
+ device = MINOR(bdev->bd_dev);
if ( current_device != -1 && current_device != device )
{
@@ -299,7 +298,7 @@ err_out:
}
static int
-z2_release( struct inode *inode, struct file *filp )
+z2_release(struct gendisk *disk, fmode_t mode)
{
if ( current_device == -1 )
return 0;
@@ -314,8 +313,8 @@ z2_release( struct inode *inode, struct file *filp )
static struct block_device_operations z2_fops =
{
.owner = THIS_MODULE,
- .__open = z2_open,
- .__release = z2_release,
+ .open = z2_open,
+ .release = z2_release,
};
static struct kobject *z2_find(dev_t dev, int *part, void *data)