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>
This commit is contained in:
committed by
Jens Axboe
parent
7e75d73080
commit
45e79a3acd
@@ -684,7 +684,7 @@ 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, cmd, p);
|
||||
error = scsi_cmd_ioctl(filp, disk->queue, disk, cmd, p);
|
||||
if (error != -ENOTTY)
|
||||
return error;
|
||||
}
|
||||
|
Reference in New Issue
Block a user