summaryrefslogtreecommitdiff
path: root/drivers/scsi/scsi_ioctl.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-03-02 08:15:49 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2008-10-21 07:47:28 -0400
commit83ff6fe8580a7c834dba4389d742332fff9b9929 (patch)
tree7708b57bdf42961749320adbbce526e551dbe6c7 /drivers/scsi/scsi_ioctl.c
parent633a08b81206122469365b4c72eaeb71f04f2cb4 (diff)
downloadlinux-3.10-83ff6fe8580a7c834dba4389d742332fff9b9929.tar.gz
linux-3.10-83ff6fe8580a7c834dba4389d742332fff9b9929.tar.bz2
linux-3.10-83ff6fe8580a7c834dba4389d742332fff9b9929.zip
[PATCH] don't mess with file in scsi_nonblockable_ioctl()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/scsi/scsi_ioctl.c')
-rw-r--r--drivers/scsi/scsi_ioctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 1f08f5a2f8f..dc1cfb2fd76 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -277,14 +277,14 @@ EXPORT_SYMBOL(scsi_ioctl);
* @filp: either NULL or a &struct file which must have the O_NONBLOCK flag.
*/
int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
- void __user *arg, struct file *filp)
+ void __user *arg, int ndelay)
{
int val, result;
/* The first set of iocts may be executed even if we're doing
* error processing, as long as the device was opened
* non-blocking */
- if (filp && (filp->f_flags & O_NONBLOCK)) {
+ if (ndelay) {
if (scsi_host_in_recovery(sdev->host))
return -ENODEV;
} else if (!scsi_block_when_processing_errors(sdev))