diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-03-02 09:35:54 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-21 07:47:57 -0400 |
| commit | b6a895307a6a8d8c294c57d319ec05286d181dac (patch) | |
| tree | 3c5404928e67915195a488e9e71f01f019aa5de2 /drivers/block | |
| parent | c9acf903e0312dcac3a135c37303adc15e6162a9 (diff) | |
| download | blackbird-op-linux-b6a895307a6a8d8c294c57d319ec05286d181dac.tar.gz blackbird-op-linux-b6a895307a6a8d8c294c57d319ec05286d181dac.zip | |
[PATCH] switch pd
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/paride/pd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index b3023844947c..9299455b0af6 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c @@ -728,9 +728,9 @@ static int pd_special_command(struct pd_unit *disk, /* kernel glue structures */ -static int pd_open(struct inode *inode, struct file *file) +static int pd_open(struct block_device *bdev, fmode_t mode) { - struct pd_unit *disk = inode->i_bdev->bd_disk->private_data; + struct pd_unit *disk = bdev->bd_disk->private_data; disk->access++; @@ -758,10 +758,10 @@ static int pd_getgeo(struct block_device *bdev, struct hd_geometry *geo) return 0; } -static int pd_ioctl(struct inode *inode, struct file *file, +static int pd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { - struct pd_unit *disk = inode->i_bdev->bd_disk->private_data; + struct pd_unit *disk = bdev->bd_disk->private_data; switch (cmd) { case CDROMEJECT: @@ -773,9 +773,9 @@ static int pd_ioctl(struct inode *inode, struct file *file, } } -static int pd_release(struct inode *inode, struct file *file) +static int pd_release(struct gendisk *p, fmode_t mode) { - struct pd_unit *disk = inode->i_bdev->bd_disk->private_data; + struct pd_unit *disk = p->private_data; if (!--disk->access && disk->removable) pd_special_command(disk, pd_door_unlock); @@ -807,9 +807,9 @@ static int pd_revalidate(struct gendisk *p) static struct block_device_operations pd_fops = { .owner = THIS_MODULE, - .__open = pd_open, - .__release = pd_release, - .__ioctl = pd_ioctl, + .open = pd_open, + .release = pd_release, + .locked_ioctl = pd_ioctl, .getgeo = pd_getgeo, .media_changed = pd_check_media, .revalidate_disk= pd_revalidate |
