Re: [PATCH] uml: Convert to unlocked_ioctls to remove implicit BKL

[Frederic Weisbecker]

On Fri, May 07, 2010 at 05:34:28PM +0200, John Kacur wrote:
> Convert to hostaudio_ioctl and hostmixer_ioctl_mixdev to unlocked_ioctl
> 
> Signed-off-by: John Kacur <jkacur@xxxxxxxxxx>


Applied, thanks John.

--
commit ced2a589711bb345278440521cba180fced01511
Author: John Kacur <jkacur@xxxxxxxxxx>
Date:   Fri May 7 17:34:28 2010 +0200

    uml: Convert to unlocked_ioctls to remove implicit BKL
    
    Convert hostaudio_ioctl and hostmixer_ioctl_mixdev to
    unlocked_ioctl without pushdown.
    
    There is nothing to protect inside, the synchronization
    is made from the host already.
    
    Signed-off-by: John Kacur <jkacur@xxxxxxxxxx>
    Cc: Arnd Bergmann <arnd@xxxxxxxx>
    Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Jeff Dike <jdike@xxxxxxxxxxx>
    Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>

diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index 368219c..ae42695 100644
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -136,7 +136,7 @@ static unsigned int hostaudio_poll(struct file *file,
 	return mask;
 }
 
-static int hostaudio_ioctl(struct inode *inode, struct file *file,
+static long hostaudio_ioctl(struct file *file,
 			   unsigned int cmd, unsigned long arg)
 {
 	struct hostaudio_state *state = file->private_data;
@@ -223,7 +223,7 @@ static int hostaudio_release(struct inode *inode, struct file *file)
 
 /* /dev/mixer file operations */
 
-static int hostmixer_ioctl_mixdev(struct inode *inode, struct file *file,
+static long hostmixer_ioctl_mixdev(struct file *file,
 				  unsigned int cmd, unsigned long arg)
 {
 	struct hostmixer_state *state = file->private_data;
@@ -289,7 +289,7 @@ static const struct file_operations hostaudio_fops = {
 	.read           = hostaudio_read,
 	.write          = hostaudio_write,
 	.poll           = hostaudio_poll,
-	.ioctl          = hostaudio_ioctl,
+	.unlocked_ioctl	= hostaudio_ioctl,
 	.mmap           = NULL,
 	.open           = hostaudio_open,
 	.release        = hostaudio_release,
@@ -298,7 +298,7 @@ static const struct file_operations hostaudio_fops = {
 static const struct file_operations hostmixer_fops = {
 	.owner          = THIS_MODULE,
 	.llseek         = no_llseek,
-	.ioctl          = hostmixer_ioctl_mixdev,
+	.unlocked_ioctl	= hostmixer_ioctl_mixdev,
 	.open           = hostmixer_open_mixdev,
 	.release        = hostmixer_release,
 };


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/