From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752923Ab0EQCsq (ORCPT ); Sun, 16 May 2010 22:48:46 -0400 Received: from mail-ww0-f46.google.com ([74.125.82.46]:64503 "EHLO mail-ww0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752900Ab0EQCso (ORCPT ); Sun, 16 May 2010 22:48:44 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=VP8Vp73A5qvva5rcrubpgeRuJq13985Adj0C+bnWf8awUQJC52AhiKdcTIwtwHu5T6 BeCjPx0P1dkBXYE55kEumU7hS2GHL33ZE2Z7u2iWywdLQAbkd2g8t6X1JkhvkMLufJRK t77ps/CnigPL4gyJGfOVraMccgC/chETbGdZ4= Date: Mon, 17 May 2010 04:48:48 +0200 From: Frederic Weisbecker To: John Kacur Cc: lkml , Arnd Bergmann , Thomas Gleixner , Ingo Molnar , Jeff Dike Subject: Re: [PATCH] uml: Convert to unlocked_ioctls to remove implicit BKL Message-ID: <20100517024846.GH22299@nowhere> References: <1273246468-11048-1-git-send-email-jkacur@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1273246468-11048-1-git-send-email-jkacur@redhat.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Applied, thanks John. -- commit ced2a589711bb345278440521cba180fced01511 Author: John Kacur 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 Cc: Arnd Bergmann Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Jeff Dike Signed-off-by: Frederic Weisbecker 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, };