From 8e2394a981b9258db47f8e223a550d46c6d40cc8 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sun, 11 Jul 2010 23:18:52 +0200 Subject: [PATCH 336/524] Staging: autoconvert trivial BKL users to private mutex All these files use the big kernel lock in a trivial way to serialize their private file operations, typically resulting from an earlier semi-automatic pushdown from VFS. None of these drivers appears to want to lock against other code, and they all use the BKL as the top-level lock in their file operations, meaning that there is no lock-order inversion problem. Consequently, we can remove the BKL completely, replacing it with a per-file mutex in every case. Using a scripted approach means we can avoid typos. file=$1 name=$2 if grep -q lock_kernel ${file} ; then if grep -q 'include.*linux.mutex.h' ${file} ; then sed -i '/include.*/d' ${file} else sed -i 's/include.*.*$/include /g' ${file} fi sed -i ${file} \ -e "/^#include.*linux.mutex.h/,$ { 1,/^\(static\|int\|long\)/ { /^\(static\|int\|long\)/istatic DEFINE_MUTEX(${name}_mutex); } }" \ -e "s/\(un\)*lock_kernel\>[ ]*()/mutex_\1lock(\&${name}_mutex)/g" \ -e '/[ ]*cycle_kernel_lock();/d' else sed -i -e '/include.*\/d' ${file} \ -e '/cycle_kernel_lock()/d' fi Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- drivers/staging/crystalhd/crystalhd_lnx.c | 9 +++++---- drivers/staging/dt3155/dt3155_drv.c | 6 ++++-- drivers/staging/vme/devices/vme_user.c | 7 ++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index 6083969..fbb80f0 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c @@ -15,11 +15,12 @@ along with this driver. If not, see . ***************************************************************************/ -#include +#include #include #include "crystalhd_lnx.h" +static DEFINE_MUTEX(chd_dec_mutex); static struct class *crystalhd_class; static struct crystalhd_adp *g_adp_info; @@ -277,16 +278,16 @@ static long chd_dec_ioctl(struct file *fd, unsigned int cmd, unsigned long ua) return -ENODATA; } - lock_kernel(); + mutex_lock(&chd_dec_mutex); cproc = crystalhd_get_cmd_proc(&adp->cmds, cmd, uc); if (!cproc) { BCMLOG_ERR("Unhandled command: %d\n", cmd); - unlock_kernel(); + mutex_unlock(&chd_dec_mutex); return -EINVAL; } ret = chd_dec_api_cmd(adp, ua, uc->uid, cmd, cproc); - unlock_kernel(); + mutex_unlock(&chd_dec_mutex); return ret; } diff --git a/drivers/staging/dt3155/dt3155_drv.c b/drivers/staging/dt3155/dt3155_drv.c index 091eb74..5311cdb 100644 --- a/drivers/staging/dt3155/dt3155_drv.c +++ b/drivers/staging/dt3155/dt3155_drv.c @@ -57,6 +57,7 @@ MA 02111-1307 USA #include #include +#include #include #include #include @@ -76,6 +77,7 @@ MA 02111-1307 USA MODULE_LICENSE("GPL"); /* Error variable. Zero means no error. */ +static DEFINE_MUTEX(dt3155_mutex); int dt3155_errno = 0; #ifndef PCI_DEVICE_ID_INTEL_7116 @@ -827,9 +829,9 @@ dt3155_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { int ret; - lock_kernel(); + mutex_lock(&dt3155_mutex); ret = dt3155_ioctl(file->f_path.dentry->d_inode, file, cmd, arg); - unlock_kernel(); + mutex_unlock(&dt3155_mutex); return ret; } diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index 326991c..8f77bd2 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include @@ -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]; @@ -559,9 +560,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); return ret; } -- 1.7.1