* [PATCH] uml: Convert to unlocked_ioctls to remove implicit BKL
@ 2010-05-07 15:34 John Kacur
2010-05-16 22:30 ` Frederic Weisbecker
2010-05-17 2:48 ` Frederic Weisbecker
0 siblings, 2 replies; 4+ messages in thread
From: John Kacur @ 2010-05-07 15:34 UTC (permalink / raw)
To: lkml
Cc: Arnd Bergmann, Frederic Weisbecker, Thomas Gleixner, Ingo Molnar,
John Kacur, Jeff Dike
Convert to hostaudio_ioctl and hostmixer_ioctl_mixdev to unlocked_ioctl
Signed-off-by: John Kacur <jkacur@redhat.com>
---
arch/um/drivers/hostaudio_kern.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
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,
};
--
1.6.6.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] uml: Convert to unlocked_ioctls to remove implicit BKL
2010-05-07 15:34 [PATCH] uml: Convert to unlocked_ioctls to remove implicit BKL John Kacur
@ 2010-05-16 22:30 ` Frederic Weisbecker
2010-05-17 11:31 ` John Kacur
2010-05-17 2:48 ` Frederic Weisbecker
1 sibling, 1 reply; 4+ messages in thread
From: Frederic Weisbecker @ 2010-05-16 22:30 UTC (permalink / raw)
To: John Kacur; +Cc: lkml, Arnd Bergmann, Thomas Gleixner, Ingo Molnar, Jeff Dike
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@redhat.com>
> ---
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.
> arch/um/drivers/hostaudio_kern.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> 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,
> };
> --
> 1.6.6.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] uml: Convert to unlocked_ioctls to remove implicit BKL
2010-05-16 22:30 ` Frederic Weisbecker
@ 2010-05-17 11:31 ` John Kacur
0 siblings, 0 replies; 4+ messages in thread
From: John Kacur @ 2010-05-17 11:31 UTC (permalink / raw)
To: Frederic Weisbecker
Cc: lkml, Arnd Bergmann, Thomas Gleixner, Ingo Molnar, Jeff Dike
----- "Frederic Weisbecker" <fweisbec@gmail.com> wrote:
> 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@redhat.com>
> > ---
>
>
>
> 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
> should then take care of the synchronization."
>
> Thanks.
>
>
>
>
> > arch/um/drivers/hostaudio_kern.c | 8 ++++----
> > 1 files changed, 4 insertions(+), 4 deletions(-)
> >
> > 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,
> > };
> > --
> > 1.6.6.1
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] uml: Convert to unlocked_ioctls to remove implicit BKL
2010-05-07 15:34 [PATCH] uml: Convert to unlocked_ioctls to remove implicit BKL John Kacur
2010-05-16 22:30 ` Frederic Weisbecker
@ 2010-05-17 2:48 ` Frederic Weisbecker
1 sibling, 0 replies; 4+ messages in thread
From: Frederic Weisbecker @ 2010-05-17 2:48 UTC (permalink / raw)
To: John Kacur; +Cc: lkml, Arnd Bergmann, Thomas Gleixner, Ingo Molnar, Jeff Dike
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@redhat.com>
Applied, thanks John.
--
commit ced2a589711bb345278440521cba180fced01511
Author: John Kacur <jkacur@redhat.com>
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@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
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,
};
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-05-17 11:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-07 15:34 [PATCH] uml: Convert to unlocked_ioctls to remove implicit BKL John Kacur
2010-05-16 22:30 ` Frederic Weisbecker
2010-05-17 11:31 ` John Kacur
2010-05-17 2:48 ` Frederic Weisbecker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).