Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Dmitry Kalinkin and committed by
Greg Kroah-Hartman
0cd189a4 ad22d55c

+5 -4
+5 -4
drivers/staging/vme/devices/vme_user.c
··· 41 41 42 42 #include "vme_user.h" 43 43 44 - static DEFINE_MUTEX(vme_user_mutex); 45 44 static const char driver_name[] = "vme_user"; 46 45 47 46 static int bus[VME_USER_BUS_MAX]; ··· 554 555 vme_user_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 555 556 { 556 557 int ret; 558 + struct inode *inode = file_inode(file); 559 + unsigned int minor = MINOR(inode->i_rdev); 557 560 558 - mutex_lock(&vme_user_mutex); 559 - ret = vme_user_ioctl(file_inode(file), file, cmd, arg); 560 - mutex_unlock(&vme_user_mutex); 561 + mutex_lock(&image[minor].mutex); 562 + ret = vme_user_ioctl(inode, file, cmd, arg); 563 + mutex_unlock(&image[minor].mutex); 561 564 562 565 return ret; 563 566 }