diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2007-07-09 06:39:20 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2007-07-16 02:52:45 -0400 |
commit | 45e79a3acdcf54113b3d7b23e9e64e6541dbfeb5 (patch) | |
tree | b8e7598b26ce446577e162189e635f6b87b10a5b /drivers/block/ub.c | |
parent | 7e75d73080d822d2bbbd5b0f7f293719dd1f9109 (diff) |
bsg: add a request_queue argument to scsi_cmd_ioctl()
bsg uses scsi_cmd_ioctl() for some SCSI/sg ioctl
commands. scsi_cmd_ioctl() gets a request queue from a gendisk
arguement. This prevents bsg being bound to SCSI devices that don't
have a gendisk (like OSD). This adds a request_queue argument to
scsi_cmd_ioctl(). The SCSI/sg ioctl commands doesn't use a gendisk so
it's safe for any SCSI devices to use scsi_cmd_ioctl().
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block/ub.c')
-rw-r--r-- | drivers/block/ub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/ub.c b/drivers/block/ub.c index 18c8b6c0db20..8b13d7d2cb63 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c | |||
@@ -1709,7 +1709,7 @@ static int ub_bd_ioctl(struct inode *inode, struct file *filp, | |||
1709 | struct gendisk *disk = inode->i_bdev->bd_disk; | 1709 | struct gendisk *disk = inode->i_bdev->bd_disk; |
1710 | void __user *usermem = (void __user *) arg; | 1710 | void __user *usermem = (void __user *) arg; |
1711 | 1711 | ||
1712 | return scsi_cmd_ioctl(filp, disk, cmd, usermem); | 1712 | return scsi_cmd_ioctl(filp, disk->queue, disk, cmd, usermem); |
1713 | } | 1713 | } |
1714 | 1714 | ||
1715 | /* | 1715 | /* |