mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
To: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Cc: Martyn Welch <martyn.welch@ge.com>,
	Manohar Vanga <manohar.vanga@gmail.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Igor Alekseev <igor.alekseev@itep.ru>,
	Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Subject: [PATCH 1/3] staging: vme: use image mutex for ioctl()
Date: Sat, 15 Nov 2014 02:36:16 +0300	[thread overview]
Message-ID: <1416008178-9393-2-git-send-email-dmitry.kalinkin@gmail.com> (raw)
In-Reply-To: <1416008178-9393-1-git-send-email-dmitry.kalinkin@gmail.com>

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: Igor Alekseev <igor.alekseev@itep.ru>
---
 drivers/staging/vme/devices/vme_user.c | 9 +++++----
 1 file 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;
 }
-- 
1.9.1


  reply	other threads:[~2014-11-14 23:36 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-14 23:36 [PATCH 0/3] mmap() for vme_user and CR/CSR fix for master Dmitry Kalinkin
2014-11-14 23:36 ` Dmitry Kalinkin [this message]
2014-11-14 23:36 ` [PATCH 2/3] staging: vme: mmap() support for vme_user Dmitry Kalinkin
2014-11-15  7:51   ` Dan Carpenter
2015-02-26 15:53     ` [PATCHv2 0/3] mmap() for vme_user and CR/CSR fix for master Dmitry Kalinkin
2015-02-26 15:53       ` [PATCHv2 1/3] staging: vme: use image mutex for ioctl() Dmitry Kalinkin
2015-02-26 15:53       ` [PATCHv2 2/3] staging: vme: mmap() support for vme_user Dmitry Kalinkin
2015-02-26 15:53       ` [PATCHv2 3/3] vme: tsi148: Master windows support USERx and CR/CSR accesses, not slaves Dmitry Kalinkin
2014-11-14 23:36 ` [PATCH " Dmitry Kalinkin

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=1416008178-9393-2-git-send-email-dmitry.kalinkin@gmail.com \
    --to=dmitry.kalinkin@gmail.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=igor.alekseev@itep.ru \
    --cc=linux-kernel@vger.kernel.org \
    --cc=manohar.vanga@gmail.com \
    --cc=martyn.welch@ge.com \
    /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

all inboxes | Powered by JetHome®