lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] switch cdrom_{open,release,ioctl} to sane APIs

Browse Source 
... convert to it in callers

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2007-10-07 17:54:28 -04:00
parent 08f8585121
commit bbc1cc9784
7 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/cdrom/viocd.c
View File

@@ -154,20 +154,22 @@ static const struct file_operations proc_viocd_operations = {
static int viocd_blk_open(struct inode *inode, struct file *file)
{
struct disk_info *di = inode->i_bdev->bd_disk->private_data;
return cdrom_open(&di->viocd_info, inode, file);
return cdrom_open(&di->viocd_info, inode->i_bdev, file->f_mode);
}
static int viocd_blk_release(struct inode *inode, struct file *file)
{
struct disk_info *di = inode->i_bdev->bd_disk->private_data;
return cdrom_release(&di->viocd_info, file);
cdrom_release(&di->viocd_info, file ? file->f_mode : 0);
return 0;
}
static int viocd_blk_ioctl(struct inode *inode, struct file *file,
unsigned cmd, unsigned long arg)
{
struct disk_info *di = inode->i_bdev->bd_disk->private_data;
return cdrom_ioctl(file, &di->viocd_info, inode, cmd, arg);
return cdrom_ioctl(&di->viocd_info, inode->i_bdev,
file ? file->f_mode : 0, cmd, arg);
}
static int viocd_blk_media_changed(struct gendisk *disk)