From: Martyn Welch <martyn.welch@ge.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-kernel@vger.kernel.org, John Kacur <jkacur@redhat.com>,
Greg Kroah-Hartman <gregkh@suse.de>,
devel@driverdev.osuosl.org
Subject: Re: [PATCH 01/12] staging: autoconvert trivial BKL users to private mutex
Date: Tue, 13 Jul 2010 09:27:51 +0100 [thread overview]
Message-ID: <4C3C2387.3090900@ge.com> (raw)
In-Reply-To: <1278883143-29035-2-git-send-email-arnd@arndb.de>
Arnd Bergmann wrote:
<snip>
> diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
> index bc16fc0..73a67a8 100644
> --- a/drivers/staging/vme/devices/vme_user.c
> +++ b/drivers/staging/vme/devices/vme_user.c
> @@ -31,7 +31,7 @@
> #include <linux/slab.h>
> #include <linux/spinlock.h>
> #include <linux/syscalls.h>
> -#include <linux/smp_lock.h>
> +#include <linux/mutex.h>
> #include <linux/types.h>
>
> #include <asm/io.h>
> @@ -40,6 +40,7 @@
> #include "../vme.h"
> #include "vme_user.h"
>
> +static DEFINE_MUTEX(vme_user_mutex);
> static char driver_name[] = "vme_user";
>
> static int bus[USER_BUS_MAX];
> @@ -560,9 +561,9 @@ vme_user_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> {
> int ret;
>
> - lock_kernel();
> + mutex_lock(&vme_user_mutex);
> ret = vme_user_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
> - unlock_kernel();
> + mutex_unlock(&vme_user_mutex);
>
Wha!, where'd that come from!!??
Ah, OK - "Staging: push down BKL into ioctl functions", missed that,
looks fine.
<http://git.kernel.org/gitweb.cgi?p=linux/kernel/git/sfr/linux-next.git;a=commitdiff;h=b1f2ac07636aadee5cb077fc7e830908b00fcaae>
Martyn
<http://git.kernel.org/gitweb.cgi?p=linux/kernel/git/sfr/linux-next.git;a=commitdiff;h=b1f2ac07636aadee5cb077fc7e830908b00fcaae>
>
> return ret;
> }
>
--
Martyn Welch (Principal Software Engineer) | Registered in England and
GE Intelligent Platforms | Wales (3828642) at 100
T +44(0)127322748 | Barbirolli Square, Manchester,
E martyn.welch@ge.com | M2 3AB VAT:GB 927559189
next prev parent reply other threads:[~2010-07-13 8:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-11 21:18 [PATCH 00/12] autoconvert trivial BKL users to private mutex Arnd Bergmann
2010-07-11 21:18 ` [PATCH 01/12] staging: " Arnd Bergmann
2010-07-13 8:27 ` Martyn Welch [this message]
2010-07-13 11:46 ` Arnd Bergmann
2010-07-11 21:18 ` [PATCH 02/12] isdn: " Arnd Bergmann
2010-07-13 3:35 ` David Miller
2010-07-11 21:18 ` [PATCH 03/12] scsi: " Arnd Bergmann
2010-07-11 21:18 ` [PATCH 04/12] media: " Arnd Bergmann
2010-07-11 21:18 ` [PATCH 05/12] usb: " Arnd Bergmann
2010-07-11 21:18 ` [PATCH 06/12] net: " Arnd Bergmann
2010-07-13 3:35 ` David Miller
2010-07-11 21:18 ` [PATCH 07/12] cris: " Arnd Bergmann
2010-07-30 17:20 ` Jesper Nilsson
2010-07-11 21:18 ` [PATCH 08/12] sbus: " Arnd Bergmann
2010-07-21 6:37 ` David Miller
2010-07-11 21:19 ` [PATCH 09/12] mtd: " Arnd Bergmann
2010-07-11 21:19 ` [PATCH 10/12] mac: " Arnd Bergmann
2010-07-11 21:19 ` [PATCH 11/12] ipmi: " Arnd Bergmann
2010-07-11 21:19 ` [PATCH 12/12] drivers: " Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C3C2387.3090900@ge.com \
--to=martyn.welch@ge.com \
--cc=arnd@arndb.de \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox