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/sd.c | |
| parent | 633a08b81206122469365b4c72eaeb71f04f2cb4 (diff) | |
| download | lwn-83ff6fe8580a7c834dba4389d742332fff9b9929.tar.gz lwn-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/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 5d74413f591a..5a18528a69d0 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -761,7 +761,8 @@ static int sd_ioctl(struct inode * inode, struct file * filp, * may try and take the device offline, in which case all further * access to the device is prohibited. */ - error = scsi_nonblockable_ioctl(sdp, cmd, p, filp); + error = scsi_nonblockable_ioctl(sdp, cmd, p, + filp ? filp->f_flags & O_NDELAY : 0); if (!scsi_block_when_processing_errors(sdp) || !error) return error; |