leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: allow COMEDI_BUFINFO, COMEDI_CANCEL and COMEDI_POLL on locked subdevice

Browse Source 
Comedi subdevices can be locked for mostly exclusive access by a
particular file object by means of the COMEDI_LOCK ioctl.  Some
operations disregard the lock.  For example, the read() and write() file
operations are allowed for the file object that set up an asynchronous
command on the subdevice (making it "busy") regardless of whether it is
locked.

The COMEDI_BUFINFO, COMEDI_CANCEL and COMEDI_POLL ioctls are also
associated with the file object that made the subdevice "busy" with a
command.  They currently obey the exclusive access lock on the subdevice
as well, but it makes more sense for them to ignore it like the read()
and write() file operations.  Remove the exclusive subdevice access
checks for these ioctls.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2014-07-02 12:02:16 +01:00 committed by Greg Kroah-Hartman
parent b11771aa4c
commit 0e02dcae1c
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/comedi/comedi_fops.c
View File

@ -968,9 +968,6 @@ static int do_bufinfo_ioctl(struct comedi_device *dev,
s = &dev->subdevices[bi.subdevice];
if (s->lock && s->lock != file)
return -EACCES;
async = s->async;
if (!async) {
@ -1744,9 +1741,6 @@ static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg,
if (s->async == NULL)
return -EINVAL;
if (s->lock && s->lock != file)
return -EACCES;
if (!s->busy)
return 0;
@ -1781,9 +1775,6 @@ static int do_poll_ioctl(struct comedi_device *dev, unsigned int arg,
return -EINVAL;
s = &dev->subdevices[arg];
if (s->lock && s->lock != file)
return -EACCES;
if (!s->busy)
return 0;