commit 74f3c8aff36ad6552ea609c8b20bfd588fa16f38
author Al Viro <viro@zeniv.linux.org.uk> Mon Aug 27 15:38:10 2007 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Tue Oct 21 07:47:14 2008 -0400
tree c046823751971ff37b66499282ca2b2e263cc71a
parent e915e872ed921d707bc32b3f2184d43abfa8c9e2

[PATCH] switch scsi_cmd_ioctl() to passing fmode_t

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

drivers/scsi/sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 202c1ed9..5d74413 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -775,7 +775,8 @@
 		case SCSI_IOCTL_GET_BUS_NUMBER:
 			return scsi_ioctl(sdp, cmd, p);
 		default:
-			error = scsi_cmd_ioctl(filp, disk->queue, disk, cmd, p);
+			error = scsi_cmd_ioctl(disk->queue, disk,
+					filp ? filp->f_mode : 0, cmd, p);
 			if (error != -ENOTTY)
 				return error;
 	}

drivers/scsi/st.c

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 5c28d08..8dffac9 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3567,8 +3567,8 @@
 			    !capable(CAP_SYS_RAWIO))
 				i = -EPERM;
 			else
-				i = scsi_cmd_ioctl(file, STp->disk->queue,
-						   STp->disk, cmd_in, p);
+				i = scsi_cmd_ioctl(STp->disk->queue, STp->disk,
+						   file->f_mode, cmd_in, p);
 			if (i != -ENOTTY)
 				return i;
 			break;