block: add and use scsi_blk_cmd_ioctl

Introduce a wrapper around scsi_cmd_ioctl that takes a block device.

The function will then be enhanced to detect partition block devices
and, in that case, subject the ioctls to whitelisting.

Cc: linux-scsi@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Cc: James Bottomley <JBottomley@parallels.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 587cce57adae..b0f553b26d0f 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1735,7 +1735,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
         case CCISS_BIG_PASSTHRU:
                 return cciss_bigpassthru(h, argp);
 
-        /* scsi_cmd_ioctl handles these, below, though some are not */
+        /* scsi_cmd_blk_ioctl handles these, below, though some are not */
         /* very meaningful for cciss.  SG_IO is the main one people want. */
 
         case SG_GET_VERSION_NUM:
@@ -1746,9 +1746,9 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
         case SG_EMULATED_HOST:
         case SG_IO:
         case SCSI_IOCTL_SEND_COMMAND:
-                return scsi_cmd_ioctl(disk->queue, disk, mode, cmd, argp);
+                return scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);
 
-        /* scsi_cmd_ioctl would normally handle these, below, but */
+        /* scsi_cmd_blk_ioctl would normally handle these, below, but */
         /* they aren't a good fit for cciss, as CD-ROMs are */
         /* not supported, and we don't have any bus/target/lun */
         /* which we present to the kernel. */