Commit ab746cb9 authored by Al Viro's avatar Al Viro

[PATCH] switch z2ram

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f3f68b36
...@@ -137,8 +137,7 @@ get_chipram( void ) ...@@ -137,8 +137,7 @@ get_chipram( void )
return; return;
} }
static int static int z2_open(struct block_device *bdev, fmode_t mode)
z2_open( struct inode *inode, struct file *filp )
{ {
int device; int device;
int max_z2_map = ( Z2RAM_SIZE / Z2RAM_CHUNKSIZE ) * int max_z2_map = ( Z2RAM_SIZE / Z2RAM_CHUNKSIZE ) *
...@@ -147,7 +146,7 @@ z2_open( struct inode *inode, struct file *filp ) ...@@ -147,7 +146,7 @@ z2_open( struct inode *inode, struct file *filp )
sizeof( z2ram_map[0] ); sizeof( z2ram_map[0] );
int rc = -ENOMEM; int rc = -ENOMEM;
device = iminor(inode); device = MINOR(bdev->bd_dev);
if ( current_device != -1 && current_device != device ) if ( current_device != -1 && current_device != device )
{ {
...@@ -299,7 +298,7 @@ z2_open( struct inode *inode, struct file *filp ) ...@@ -299,7 +298,7 @@ z2_open( struct inode *inode, struct file *filp )
} }
static int static int
z2_release( struct inode *inode, struct file *filp ) z2_release(struct gendisk *disk, fmode_t mode)
{ {
if ( current_device == -1 ) if ( current_device == -1 )
return 0; return 0;
...@@ -314,8 +313,8 @@ z2_release( struct inode *inode, struct file *filp ) ...@@ -314,8 +313,8 @@ z2_release( struct inode *inode, struct file *filp )
static struct block_device_operations z2_fops = static struct block_device_operations z2_fops =
{ {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.__open = z2_open, .open = z2_open,
.__release = z2_release, .release = z2_release,
}; };
static struct kobject *z2_find(dev_t dev, int *part, void *data) static struct kobject *z2_find(dev_t dev, int *part, void *data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment