Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 83ff6fe8580a7c834dba4389d742332fff9b9929

Authored by Al Viro
1 parent 633a08b812
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] don't mess with file in scsi_nonblockable_ioctl() 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 5 changed files with 9 additions and 6 deletions Side-by-side Diff

drivers/scsi/scsi_ioctl.c
Diff comments   View file @ 83ff6fe
... ... @@ -277,14 +277,14 @@
277 277 * @filp: either NULL or a &struct file which must have the O_NONBLOCK flag.
278 278 */
279 279 int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
280   - void __user *arg, struct file *filp)
  280 + void __user *arg, int ndelay)
281 281 {
282 282 int val, result;
283 283  
284 284 /* The first set of iocts may be executed even if we're doing
285 285 * error processing, as long as the device was opened
286 286 * non-blocking */
287   - if (filp && (filp->f_flags & O_NONBLOCK)) {
  287 + if (ndelay) {
288 288 if (scsi_host_in_recovery(sdev->host))
289 289 return -ENODEV;
290 290 } else if (!scsi_block_when_processing_errors(sdev))
... ... @@ -761,7 +761,8 @@
761 761 * may try and take the device offline, in which case all further
762 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 766 if (!scsi_block_when_processing_errors(sdp) || !error)
766 767 return error;
767 768  
... ... @@ -524,7 +524,8 @@
524 524 * case fall through to scsi_ioctl, which will return ENDOEV again
525 525 * if it doesn't recognise the ioctl
526 526 */
527   - ret = scsi_nonblockable_ioctl(sdev, cmd, argp, NULL);
  527 + ret = scsi_nonblockable_ioctl(sdev, cmd, argp,
  528 + file ? file->f_flags & O_NDELAY : 0);
528 529 if (ret != -ENODEV)
529 530 return ret;
530 531 return scsi_ioctl(sdev, cmd, argp);
... ... @@ -3263,7 +3263,8 @@
3263 3263 * may try and take the device offline, in which case all further
3264 3264 * access to the device is prohibited.
3265 3265 */
3266   - retval = scsi_nonblockable_ioctl(STp->device, cmd_in, p, file);
  3266 + retval = scsi_nonblockable_ioctl(STp->device, cmd_in, p,
  3267 + file->f_flags & O_NDELAY);
3267 3268 if (!scsi_block_when_processing_errors(STp->device) || retval != -ENODEV)
3268 3269 goto out;
3269 3270 retval = 0;
include/scsi/scsi_ioctl.h
Diff comments   View file @ 83ff6fe
... ... @@ -42,7 +42,7 @@
42 42  
43 43 extern int scsi_ioctl(struct scsi_device *, int, void __user *);
44 44 extern int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
45   - void __user *arg, struct file *filp);
  45 + void __user *arg, int ndelay);
46 46  
47 47 #endif /* __KERNEL__ */
48 48 #endif /* _SCSI_IOCTL_H */