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

From: John Kacur
Date: Mon May 17 2010 - 07:32:44 EST



----- "Frederic Weisbecker" <fweisbec@xxxxxxxxx> 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@xxxxxxxxxx>
> > ---
>
>
>
> 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
> >
--
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/