diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2015-02-26 18:53:09 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-06 17:03:22 -0800 |
| commit | 0cd189a42da07c89c809debc1f6a75f5ec0f5c43 (patch) | |
| tree | b4a47d098d8d8afb60324548e62132f8e6b84320 /drivers/staging/vme/devices | |
| parent | ad22d55c4b304a163c7372c00768f50adaecc686 (diff) | |
| download | op-kernel-dev-0cd189a42da07c89c809debc1f6a75f5ec0f5c43.zip op-kernel-dev-0cd189a42da07c89c809debc1f6a75f5ec0f5c43.tar.gz | |
staging: vme: use image mutex for ioctl()
This implements more granular locking in vme_user_ioctl() by using separate
locks for each devfs device.
This also provides a synchronization between vme_user_read(), vme_user_write()
and vme_user_ioctl().
Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Cc: Martyn Welch <martyn.welch@ge.com>
Cc: Igor Alekseev <igor.alekseev@itep.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vme/devices')
| -rw-r--r-- | drivers/staging/vme/devices/vme_user.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index 8b1f533..8731838 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c @@ -41,7 +41,6 @@ #include "vme_user.h" -static DEFINE_MUTEX(vme_user_mutex); static const char driver_name[] = "vme_user"; static int bus[VME_USER_BUS_MAX]; @@ -555,10 +554,12 @@ static long vme_user_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { int ret; + struct inode *inode = file_inode(file); + unsigned int minor = MINOR(inode->i_rdev); - mutex_lock(&vme_user_mutex); - ret = vme_user_ioctl(file_inode(file), file, cmd, arg); - mutex_unlock(&vme_user_mutex); + mutex_lock(&image[minor].mutex); + ret = vme_user_ioctl(inode, file, cmd, arg); + mutex_unlock(&image[minor].mutex); return ret; } |
