5 files changed, 9 insertions, 6 deletions

diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 1f08f5a2f8fd..dc1cfb2fd76b 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))
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;
 
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);
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 8dffac9f3419..c959bdc55f4f 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;
diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h
index edb9525386da..b9006848b813 100644
--- a/include/scsi/scsi_ioctl.h
+++ b/include/scsi/scsi_ioctl.h
@@ -42,7 +42,7 @@ typedef struct scsi_fctargaddress {
 
 extern int scsi_ioctl(struct scsi_device *, int, void __user *);
 extern int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
-                                   void __user *arg, struct file *filp);
+                                   void __user *arg, int ndelay);
 
 #endif /* __KERNEL__ */
 #endif /* _SCSI_IOCTL_H */