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/st.c | |
| parent | 633a08b81206122469365b4c72eaeb71f04f2cb4 (diff) | |
| download | kernel_samsung_tuna-83ff6fe8580a7c834dba4389d742332fff9b9929.zip kernel_samsung_tuna-83ff6fe8580a7c834dba4389d742332fff9b9929.tar.gz kernel_samsung_tuna-83ff6fe8580a7c834dba4389d742332fff9b9929.tar.bz2 | |
[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/st.c')
| -rw-r--r-- | drivers/scsi/st.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 8dffac9..c959bdc 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -3263,7 +3263,8 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg) * may try and take the device offline, in which case all further * access to the device is prohibited. */ - retval = scsi_nonblockable_ioctl(STp->device, cmd_in, p, file); + retval = scsi_nonblockable_ioctl(STp->device, cmd_in, p, + file->f_flags & O_NDELAY); if (!scsi_block_when_processing_errors(STp->device) || retval != -ENODEV) goto out; retval = 0; |