pktcdvd: push BKL down into driver
Push the lock_kernel down into the driver and switch to unlocked_ioctl [akpm@linux-foundation.org: build fix] Signed-off-by: Alan Cox <alan@redhat.com> Acked-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
parent
be1fd70fea
commit
5b6155ee70
1 changed files with 25 additions and 10 deletions
|
@ -49,6 +49,7 @@
|
|||
#include <linux/types.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/kthread.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/file.h>
|
||||
|
@ -2797,9 +2798,14 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
|
||||
static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
struct pktcdvd_device *pd = inode->i_bdev->bd_disk->private_data;
|
||||
struct inode *inode = file->f_path.dentry->d_inode;
|
||||
struct pktcdvd_device *pd;
|
||||
long ret;
|
||||
|
||||
lock_kernel();
|
||||
pd = inode->i_bdev->bd_disk->private_data;
|
||||
|
||||
VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode));
|
||||
|
||||
|
@ -2812,7 +2818,8 @@ static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
|
|||
case CDROM_LAST_WRITTEN:
|
||||
case CDROM_SEND_PACKET:
|
||||
case SCSI_IOCTL_SEND_COMMAND:
|
||||
return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
|
||||
ret = blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
|
||||
break;
|
||||
|
||||
case CDROMEJECT:
|
||||
/*
|
||||
|
@ -2821,14 +2828,15 @@ static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
|
|||
*/
|
||||
if (pd->refcnt == 1)
|
||||
pkt_lock_door(pd, 0);
|
||||
return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
|
||||
ret = blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
|
||||
break;
|
||||
|
||||
default:
|
||||
VPRINTK(DRIVER_NAME": Unknown ioctl for %s (%x)\n", pd->name, cmd);
|
||||
return -ENOTTY;
|
||||
ret = -ENOTTY;
|
||||
}
|
||||
|
||||
return 0;
|
||||
unlock_kernel();
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int pkt_media_changed(struct gendisk *disk)
|
||||
|
@ -2850,7 +2858,7 @@ static struct block_device_operations pktcdvd_ops = {
|
|||
.owner = THIS_MODULE,
|
||||
.open = pkt_open,
|
||||
.release = pkt_close,
|
||||
.ioctl = pkt_ioctl,
|
||||
.unlocked_ioctl = pkt_ioctl,
|
||||
.media_changed = pkt_media_changed,
|
||||
};
|
||||
|
||||
|
@ -3015,7 +3023,8 @@ static void pkt_get_status(struct pkt_ctrl_command *ctrl_cmd)
|
|||
mutex_unlock(&ctl_mutex);
|
||||
}
|
||||
|
||||
static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
|
||||
static long pkt_ctl_ioctl(struct file *file, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
void __user *argp = (void __user *)arg;
|
||||
struct pkt_ctrl_command ctrl_cmd;
|
||||
|
@ -3032,16 +3041,22 @@ static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cm
|
|||
case PKT_CTRL_CMD_SETUP:
|
||||
if (!capable(CAP_SYS_ADMIN))
|
||||
return -EPERM;
|
||||
lock_kernel();
|
||||
ret = pkt_setup_dev(new_decode_dev(ctrl_cmd.dev), &pkt_dev);
|
||||
ctrl_cmd.pkt_dev = new_encode_dev(pkt_dev);
|
||||
unlock_kernel();
|
||||
break;
|
||||
case PKT_CTRL_CMD_TEARDOWN:
|
||||
if (!capable(CAP_SYS_ADMIN))
|
||||
return -EPERM;
|
||||
lock_kernel();
|
||||
ret = pkt_remove_dev(new_decode_dev(ctrl_cmd.pkt_dev));
|
||||
unlock_kernel();
|
||||
break;
|
||||
case PKT_CTRL_CMD_STATUS:
|
||||
lock_kernel();
|
||||
pkt_get_status(&ctrl_cmd);
|
||||
unlock_kernel();
|
||||
break;
|
||||
default:
|
||||
return -ENOTTY;
|
||||
|
@ -3054,7 +3069,7 @@ static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cm
|
|||
|
||||
|
||||
static const struct file_operations pkt_ctl_fops = {
|
||||
.ioctl = pkt_ctl_ioctl,
|
||||
.unlocked_ioctl = pkt_ctl_ioctl,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue