Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45e79a3a authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

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: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 7e75d730

block/bsg.c

+1 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ bsg_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 
	case SG_EMULATED_HOST:

	case SCSI_IOCTL_SEND_COMMAND: {

		void __user *uarg = (void __user *) arg;

		return scsi_cmd_ioctl(file, bd->disk, cmd, uarg);

		return scsi_cmd_ioctl(file, bd->queue, bd->disk, cmd, uarg);

	}

	case SG_IO: {

		struct request *rq;

block/scsi_ioctl.c

+3 −7
Original line number Diff line number Diff line
@@ -548,16 +548,12 @@ static inline int blk_send_start_stop(request_queue_t *q, struct gendisk *bd_dis 
	return __blk_send_generic(q, bd_disk, GPCMD_START_STOP_UNIT, data);

}



int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd, void __user *arg)

int scsi_cmd_ioctl(struct file *file, struct request_queue *q,

		   struct gendisk *bd_disk, unsigned int cmd, void __user *arg)

{

	request_queue_t *q;

	int err;



	q = bd_disk->queue;

	if (!q)

		return -ENXIO;



	if (blk_get_queue(q))

	if (!q || blk_get_queue(q))

		return -ENXIO;



	switch (cmd) {

drivers/block/ub.c

+1 −1
Original line number Diff line number Diff line
@@ -1709,7 +1709,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, cmd, usermem);

	return scsi_cmd_ioctl(filp, disk->queue, disk, cmd, usermem);

}



/*

drivers/cdrom/cdrom.c

+2 −1
Original line number Diff line number Diff line
@@ -2695,11 +2695,12 @@ int cdrom_ioctl(struct file * file, struct cdrom_device_info *cdi, 
{

	void __user *argp = (void __user *)arg;

	int ret;

	struct gendisk *disk = ip->i_bdev->bd_disk;



	/*

	 * Try the generic SCSI command ioctl's first.

	 */

	ret = scsi_cmd_ioctl(file, ip->i_bdev->bd_disk, cmd, argp);

	ret = scsi_cmd_ioctl(file, disk->queue, disk, cmd, argp);

	if (ret != -ENOTTY)

		return ret;

drivers/ide/ide.c

+1 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device 
	int err, (*setfunc)(ide_drive_t *, int);

	u8 *val;



	err = scsi_cmd_ioctl(file, bdev->bd_disk, cmd, p);

	err = scsi_cmd_ioctl(file, bdev->bd_disk->queue, bdev->bd_disk, cmd, p);

	if (err != -ENOTTY)

		return err;