aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sd.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/sd.c
parent633a08b81206122469365b4c72eaeb71f04f2cb4 (diff)
[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.c3
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,
761 * may try and take the device offline, in which case all further 761 * may try and take the device offline, in which case all further
762 * access to the device is prohibited. 762 * access to the device is prohibited.
763 */ 763 */
764 error = scsi_nonblockable_ioctl(sdp, cmd, p, filp); 764 error = scsi_nonblockable_ioctl(sdp, cmd, p,
765 filp ? filp->f_flags & O_NDELAY : 0);
765 if (!scsi_block_when_processing_errors(sdp) || !error) 766 if (!scsi_block_when_processing_errors(sdp) || !error)
766 return error; 767 return error;
767 768