diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-03-02 08:15:49 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-21 07:47:28 -0400 |
| commit | 83ff6fe8580a7c834dba4389d742332fff9b9929 (patch) | |
| tree | 7708b57bdf42961749320adbbce526e551dbe6c7 /drivers/scsi/sr.c | |
| parent | 633a08b81206122469365b4c72eaeb71f04f2cb4 (diff) | |
| download | linux-83ff6fe8580a7c834dba4389d742332fff9b9929.tar.gz | |
[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/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index b92e2dac9aa9..2fb8d4d2d6f6 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -524,7 +524,8 @@ static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd, * case fall through to scsi_ioctl, which will return ENDOEV again * if it doesn't recognise the ioctl */ - ret = scsi_nonblockable_ioctl(sdev, cmd, argp, NULL); + ret = scsi_nonblockable_ioctl(sdev, cmd, argp, + file ? file->f_flags & O_NDELAY : 0); if (ret != -ENODEV) return ret; return scsi_ioctl(sdev, cmd, argp); |