Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755209AbZCXWYr (ORCPT ); Tue, 24 Mar 2009 18:24:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752137AbZCXWYg (ORCPT ); Tue, 24 Mar 2009 18:24:36 -0400 Received: from mail-fx0-f158.google.com ([209.85.220.158]:35954 "EHLO mail-fx0-f158.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751766AbZCXWYe (ORCPT ); Tue, 24 Mar 2009 18:24:34 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=dorM1HHiq9c+LYNIyrmmF/72UAgN/Fp4ADK7nb+nHUDVtHpYzKusuTayQRT3yhkrOY LV3PnJltcbIfby1jU95aVHfDxEWw5u6tOtt+eaAgHQ9k+cg4o50d5aVawnTiooLLrb+X Gtiw13COfxHlMjGB4kUS41spntdWb0mYdZn3o= Subject: Re: [PATCH 12/13][Resubmit][drivers/media] changed ioctls to unlocked From: Alexey Klimov To: stoyboyker@gmail.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org In-Reply-To: <1237930711-16200-1-git-send-email-stoyboyker@gmail.com> References: <1237930711-16200-1-git-send-email-stoyboyker@gmail.com> Content-Type: text/plain Date: Wed, 25 Mar 2009 01:25:35 +0300 Message-Id: <1237933535.9222.12.camel@tux.localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.24.4 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3048 Lines: 95 Hello, Stoyan On Tue, 2009-03-24 at 16:38 -0500, stoyboyker@gmail.com wrote: > From: Stoyan Gaydarov > > Signed-off-by: Stoyan Gaydarov > --- > drivers/media/dvb/bt8xx/dst_ca.c | 7 +++++-- > drivers/media/video/dabusb.c | 11 ++++++++--- > 2 files changed, 13 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c > index 0258451..d3487c5 100644 > --- a/drivers/media/dvb/bt8xx/dst_ca.c > +++ b/drivers/media/dvb/bt8xx/dst_ca.c > @@ -552,8 +552,10 @@ free_mem_and_exit: > return result; > } > > -static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long ioctl_arg) > +static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioctl_arg) > { > + lock_kernel(); > + > struct dvb_device* dvbdev = (struct dvb_device*) file->private_data; > struct dst_state* state = (struct dst_state*) dvbdev->priv; > struct ca_slot_info *p_ca_slot_info; > @@ -647,6 +649,7 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd > kfree (p_ca_slot_info); > kfree (p_ca_caps); > > + unlock_kernel(); > return result; > } > > @@ -684,7 +687,7 @@ static ssize_t dst_ca_write(struct file *file, const char __user *buffer, size_t > > static struct file_operations dst_ca_fops = { > .owner = THIS_MODULE, > - .ioctl = dst_ca_ioctl, > + .unlocked_ioctl = dst_ca_ioctl, > .open = dst_ca_open, > .release = dst_ca_release, > .read = dst_ca_read, > diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c > index 298810d..c31e76f 100644 > --- a/drivers/media/video/dabusb.c > +++ b/drivers/media/video/dabusb.c > @@ -657,22 +657,26 @@ static int dabusb_release (struct inode *inode, struct file *file) > return 0; > } > > -static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) > +static long dabusb_ioctl (struct file *file, unsigned int cmd, unsigned long arg) > { > pdabusb_t s = (pdabusb_t) file->private_data; > pbulk_transfer_t pbulk; > int ret = 0; > int version = DABUSB_VERSION; > > + lock_kernel(); > dbg("dabusb_ioctl"); > > - if (s->remove_pending) > + if (s->remove_pending) { > + unlock_kernel(); > return -EIO; > + } > > mutex_lock(&s->mutex); > > if (!s->usbdev) { > mutex_unlock(&s->mutex); > + unlock_kernel(); > return -EIO; > } > > @@ -713,6 +717,7 @@ static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm > break; > } > mutex_unlock(&s->mutex); > + unlock_kernel(); May i ask why big kernel lock is used here? Where is an advantage of BKL here? Why not to use, for example, one more mutex lock? -- Best regards, Klimov Alexey -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/