[PATCH] switch scsi_cmd_ioctl() to passing fmode_t

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

10 files changed, 20 insertions, 18 deletions

diff --git a/block/bsg.c b/block/bsg.c
index 2d36b127f384..e8bd2475682a 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -914,7 +914,7 @@ static long bsg_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case SG_EMULATED_HOST:
         case SCSI_IOCTL_SEND_COMMAND: {
                 void __user *uarg = (void __user *) arg;
-                return scsi_cmd_ioctl(file, bd->queue, NULL, cmd, uarg);
+                return scsi_cmd_ioctl(bd->queue, NULL, file->f_mode, cmd, uarg);
         }
         case SG_IO: {
                 struct request *rq;
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 375e25df8adc..5963cf91a3a0 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -517,8 +517,8 @@ static inline int blk_send_start_stop(struct request_queue *q,
         return __blk_send_generic(q, bd_disk, GPCMD_START_STOP_UNIT, data);
 }
 
-int scsi_cmd_ioctl(struct file *file, struct request_queue *q,
-                   struct gendisk *bd_disk, unsigned int cmd, void __user *arg)
+int scsi_cmd_ioctl(struct request_queue *q, struct gendisk *bd_disk, fmode_t mode,
+                   unsigned int cmd, void __user *arg)
 {
         int err;
 
@@ -559,7 +559,7 @@ int scsi_cmd_ioctl(struct file *file, struct request_queue *q,
                         err = -EFAULT;
                         if (copy_from_user(&hdr, arg, sizeof(hdr)))
                                 break;
-                        err = sg_io(q, bd_disk, &hdr, file ? file->f_mode : 0);
+                        err = sg_io(q, bd_disk, &hdr, mode);
                         if (err == -EFAULT)
                                 break;
 
@@ -607,7 +607,7 @@ int scsi_cmd_ioctl(struct file *file, struct request_queue *q,
                         hdr.cmdp = ((struct cdrom_generic_command __user*) arg)->cmd;
                         hdr.cmd_len = sizeof(cgc.cmd);
 
-                        err = sg_io(q, bd_disk, &hdr, file ? file->f_mode : 0);
+                        err = sg_io(q, bd_disk, &hdr, mode);
                         if (err == -EFAULT)
                                 break;
 
@@ -631,7 +631,7 @@ int scsi_cmd_ioctl(struct file *file, struct request_queue *q,
                         if (!arg)
                                 break;
 
-                        err = sg_scsi_ioctl(q, bd_disk, file ? file->f_mode : 0, arg);
+                        err = sg_scsi_ioctl(q, bd_disk, mode, arg);
                         break;
                 case CDROMCLOSETRAY:
                         err = blk_send_start_stop(q, bd_disk, 0x03);
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 1e1f9153000c..d9b1c15b8113 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1232,7 +1232,8 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
         case SG_EMULATED_HOST:
         case SG_IO:
         case SCSI_IOCTL_SEND_COMMAND:
-                return scsi_cmd_ioctl(filep, disk->queue, disk, cmd, argp);
+                return scsi_cmd_ioctl(disk->queue, disk,
+                                      filep ? filep->f_mode : 0, cmd, argp);
 
         /* scsi_cmd_ioctl would normally handle these, below, but */
         /* they aren't a good fit for cciss, as CD-ROMs are */
diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 85d41eb67c0b..bc04330f3683 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -1729,7 +1729,7 @@ static int ub_bd_ioctl(struct inode *inode, struct file *filp,
         struct gendisk *disk = inode->i_bdev->bd_disk;
         void __user *usermem = (void __user *) arg;
 
-        return scsi_cmd_ioctl(filp, disk->queue, disk, cmd, usermem);
+        return scsi_cmd_ioctl(disk->queue, disk, filp ? filp->f_mode : 0, cmd, usermem);
 }
 
 /*
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 6ec5fc052786..7643cd16fd67 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -149,8 +149,8 @@ static void do_virtblk_request(struct request_queue *q)
 static int virtblk_ioctl(struct inode *inode, struct file *filp,
                          unsigned cmd, unsigned long data)
 {
-        return scsi_cmd_ioctl(filp, inode->i_bdev->bd_disk->queue,
-                              inode->i_bdev->bd_disk, cmd,
+        return scsi_cmd_ioctl(inode->i_bdev->bd_disk->queue,
+                              inode->i_bdev->bd_disk, filp->f_mode, cmd,
                               (void __user *)data);
 }
 
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 4feefa622aed..e286eb5d1f6a 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2672,7 +2672,7 @@ int cdrom_ioctl(struct file * file, struct cdrom_device_info *cdi,
         /*
          * Try the generic SCSI command ioctl's first.
          */
-        ret = scsi_cmd_ioctl(file, disk->queue, disk, cmd, argp);
+        ret = scsi_cmd_ioctl(disk->queue, disk, file ? file->f_mode : 0, cmd, argp);
         if (ret != -ENOTTY)
                 return ret;
 
diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c
index 0d5f5054ab64..3c9da4ac9341 100644
--- a/drivers/ide/ide-floppy_ioctl.c
+++ b/drivers/ide/ide-floppy_ioctl.c
@@ -280,8 +280,8 @@ int ide_floppy_ioctl(ide_drive_t *drive, struct inode *inode,
          * and CDROM_SEND_PACKET (legacy) ioctls
          */
         if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND)
-                err = scsi_cmd_ioctl(file, bdev->bd_disk->queue,
-                                        bdev->bd_disk, cmd, argp);
+                err = scsi_cmd_ioctl(bdev->bd_disk->queue, bdev->bd_disk,
+                                file ? file->f_mode : 0, cmd, argp);
 
         if (err == -ENOTTY)
                 err = generic_ide_ioctl(drive, file, bdev, cmd, arg);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 202c1ed9abd7..5d74413f591a 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -775,7 +775,8 @@ static int sd_ioctl(struct inode * inode, struct file * filp,
                 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;
         }
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 5c28d08f18f4..8dffac9f3419 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3567,8 +3567,8 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg)
                             !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;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 8945c30e9936..48f41b991adb 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -717,8 +717,8 @@ extern void blk_plug_device(struct request_queue *);
 extern void blk_plug_device_unlocked(struct request_queue *);
 extern int blk_remove_plug(struct request_queue *);
 extern void blk_recount_segments(struct request_queue *, struct bio *);
-extern int scsi_cmd_ioctl(struct file *, struct request_queue *,
-                          struct gendisk *, unsigned int, void __user *);
+extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t,
+                          unsigned int, void __user *);
 extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,
                          struct scsi_ioctl_command __user *);