Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10c0ad4d authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

viotape: Use unlocked_ioctl 



This pushes the BKL down into the driver.  Based on a patch by Alan Cox.

We need to do it this way for now as the inode parameter of viotap_ioctl
is used internally as a flag.  We should do a further cleanup patch.

Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 74f06095

drivers/char/viotape.c

+18 −6
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <linux/completion.h>

#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#include <linux/smp_lock.h>



#include <asm/uaccess.h>

#include <asm/ioctls.h>
@@ -677,6 +678,17 @@ static int viotap_ioctl(struct inode *inode, struct file *file, 
	return ret;

}



static long viotap_unlocked_ioctl(struct file *file,

		unsigned int cmd, unsigned long arg)

{

	long rc;



	lock_kernel();

	rc = viotap_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);

	unlock_kernel();

	return rc;

}



static int viotap_open(struct inode *inode, struct file *file)

{

	HvLpEvent_Rc hvrc;
@@ -786,7 +798,7 @@ const struct file_operations viotap_fops = { 
	.owner =		THIS_MODULE,

	.read =			viotap_read,

	.write =		viotap_write,

	.ioctl =	viotap_ioctl,

	.unlocked_ioctl =	viotap_unlocked_ioctl,

	.open =			viotap_open,

	.release =		viotap_release,

};