From 8d8c1f290ed849ada3197f33271d8c5a9bbb117b Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 2 Mar 2008 10:27:58 -0500 Subject: [PATCH] --- yaml --- r: 117533 b: refs/heads/master c: a4600f81393d685043fe2d485cf2b123301f467d h: refs/heads/master i: 117531: 8644619761264088e605dabde6151765ec403549 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-tape.c | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 11ae56555d39..13bd592445c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2f21e057dfbaa12acca1e79d9aeb3d9169d2e2e +refs/heads/master: a4600f81393d685043fe2d485cf2b123301f467d diff --git a/trunk/drivers/ide/ide-tape.c b/trunk/drivers/ide/ide-tape.c index c5df53c4838c..a2d470eb2b55 100644 --- a/trunk/drivers/ide/ide-tape.c +++ b/trunk/drivers/ide/ide-tape.c @@ -2340,32 +2340,27 @@ static const struct file_operations idetape_fops = { .release = idetape_chrdev_release, }; -static int idetape_open(struct inode *inode, struct file *filp) +static int idetape_open(struct block_device *bdev, fmode_t mode) { - struct gendisk *disk = inode->i_bdev->bd_disk; - struct ide_tape_obj *tape; + struct ide_tape_obj *tape = ide_tape_get(bdev->bd_disk); - tape = ide_tape_get(disk); if (!tape) return -ENXIO; return 0; } -static int idetape_release(struct inode *inode, struct file *filp) +static int idetape_release(struct gendisk *disk, fmode_t mode) { - struct gendisk *disk = inode->i_bdev->bd_disk; struct ide_tape_obj *tape = ide_drv_g(disk, ide_tape_obj); ide_tape_put(tape); - return 0; } -static int idetape_ioctl(struct inode *inode, struct file *file, +static int idetape_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { - struct block_device *bdev = inode->i_bdev; struct ide_tape_obj *tape = ide_drv_g(bdev->bd_disk, ide_tape_obj); ide_drive_t *drive = tape->drive; int err = generic_ide_ioctl(drive, bdev, cmd, arg); @@ -2376,9 +2371,9 @@ static int idetape_ioctl(struct inode *inode, struct file *file, static struct block_device_operations idetape_block_ops = { .owner = THIS_MODULE, - .__open = idetape_open, - .__release = idetape_release, - .__ioctl = idetape_ioctl, + .open = idetape_open, + .release = idetape_release, + .locked_ioctl = idetape_ioctl, }; static int ide_tape_probe(ide_drive_t *drive)