uml: Convert to unlocked_ioctls to remove implicit BKL
PATCH 1/1 uml: Convert to unlocked_ioctls to remove implicit BKL
Convert to hostaudio_ioctl and hostmixer_ioctl_mixdev to unlocked_ioctl
--- arch/um/drivers/hostaudio_kern.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
arch/um/drivers/hostaudio_kern.c +4 -4
@@ -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, };
Signature · 1 line
1.6.6.1
Quoted 4 lines · John Kacur
Convert to
hostaudio_ioctlandhostmixer_ioctl_mixdevtounlocked_ioctlSigned-off-by John Kacur <[email protected]>---
Hi John,
The patch looks good and I'm about to queue it, however it lacks a changelog that properly explains the safety of the conversion.
Are you fine with this?
"We don't do anything except relying the ioctl to the host which should then take care of the synchronization."
Thanks.
Quoted 46 lines
arch/um/drivers/hostaudio_kern.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)arch/um/drivers/hostaudio_kern.c +4
-4@@ -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, };Signature · 1 line
1.6.6.1
Quoted 9 lines · ----- "Frederic Weisbecker
Quoted 1 line · John Kacur
Convert to
hostaudio_ioctlandhostmixer_ioctl_mixdevto
unlocked_ioctlQuoted 3 lines
Signed-off-by John Kacur <[email protected]>---
Quoted 8 lines
Hi John,
The patch looks good and I'm about to queue it, however it lacks a changelog that properly explains the safety of the conversion.
Are you fine with this?
"We don't do anything except relying the ioctl to the host which
s/relying/relaying
Other than that, fine with me, thanks!
John
Quoted 59 lines
should then take care of the synchronization."
Thanks.
Review
Quoted 4 lines
arch/um/drivers/hostaudio_kern.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)(quoted diff) +0
-0
b/arch/um/drivers/hostaudio_kern.carch/um/drivers/hostaudio_kern.c static unsigned int hostaudio_poll(struct file
Quoted 4 lines
index 368219c..ae42695 100644
arch/um/drivers/hostaudio_kern.c +0
-0@@ -136,7 +136,7 @@ static unsigned int hostaudio_poll(struct file*file,
arch/um/drivers/hostaudio_kern.c static int hostaudio_release(struct inode
Quoted 9 lines
arch/um/drivers/hostaudio_kern.c +1
-1return 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)
arch/um/drivers/hostaudio_kern.c static int hostaudio_release(struct inode *inode, struct file *file)
Quoted 4 lines
arch/um/drivers/hostaudio_kern.c +0
-1/* /dev/mixer file operations */ -static int hostmixer_ioctl_mixdev(struct inode *inode, struct file*file,
arch/um/drivers/hostaudio_kern.c static const struct file_operations
Quoted 5 lines
arch/um/drivers/hostaudio_kern.c +1
-0+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= {arch/um/drivers/hostaudio_kern.c static const struct file_operations
Quoted 9 lines
arch/um/drivers/hostaudio_kern.c +1
-1.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= {Quoted 11 lines
arch/um/drivers/hostaudio_kern.c +1
-1static 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, };Signature · 1 line
1.6.6.1
Frederic Weisbecker
AppliedQuoted 3 lines · John Kacur
Convert to
hostaudio_ioctlandhostmixer_ioctl_mixdevtounlocked_ioctlSigned-off-by John Kacur <[email protected]>
Applied, thanks John.
--
commit ced2a589711bb345278440521cba180fced01511
Author: John Kacur <[email protected]> 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.
arch/um/drivers/hostaudio_kern.c +4 -4
@@ -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, };