Commit d52fe8f4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: bsg: Decouple from scsi_cmd_ioctl() 

Decouple bsg from scsi_cmd_ioctl().  This requires a small amount of code
duplication, but will allow moving all SCSI ioctl handling into SCSI
midlayer.

Link: https://lore.kernel.org/r/20210724072033.1284840-14-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 547e2f70

block/bsg.c

+22 −2
Original line number Diff line number Diff line
@@ -351,7 +351,10 @@ static int bsg_set_command_q(struct bsg_device *bd, int __user *uarg) 
static long bsg_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	struct bsg_device *bd = file->private_data;

	struct request_queue *q = bd->queue;

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

	int __user *intp = uarg;

	int val;



	switch (cmd) {

	/*
@@ -366,16 +369,33 @@ static long bsg_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	 * SCSI/sg ioctls

	 */

	case SG_GET_VERSION_NUM:

		return put_user(30527, intp);

	case SCSI_IOCTL_GET_IDLUN:

		return put_user(0, intp);

	case SCSI_IOCTL_GET_BUS_NUMBER:

		return put_user(0, intp);

	case SG_SET_TIMEOUT:

		if (get_user(val, intp))

			return -EFAULT;

		q->sg_timeout = clock_t_to_jiffies(val);

		return 0;

	case SG_GET_TIMEOUT:

		return jiffies_to_clock_t(q->sg_timeout);

	case SG_GET_RESERVED_SIZE:

		return put_user(min(q->sg_reserved_size, queue_max_bytes(q)),

				intp);

	case SG_SET_RESERVED_SIZE:

		if (get_user(val, intp))

			return -EFAULT;

		if (val < 0)

			return -EINVAL;

		q->sg_reserved_size =

			min_t(unsigned int, val, queue_max_bytes(q));

		return 0;

	case SG_EMULATED_HOST:

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

		return put_user(1, intp);

	case SG_IO:

		return bsg_sg_io(bd->queue, file->f_mode, uarg);

		return bsg_sg_io(q, file->f_mode, uarg);

	case SCSI_IOCTL_SEND_COMMAND:

		pr_warn_ratelimited("%s: calling unsupported SCSI_IOCTL_SEND_COMMAND\n",

				current->comm);

block/scsi_ioctl.c

+0 −16
Original line number Diff line number Diff line
@@ -43,16 +43,6 @@ static int sg_get_version(int __user *p) 
	return put_user(sg_version_num, p);

}



static int scsi_get_idlun(struct request_queue *q, int __user *p)

{

	return put_user(0, p);

}



static int scsi_get_bus(struct request_queue *q, int __user *p)

{

	return put_user(0, p);

}



static int sg_get_timeout(struct request_queue *q)

{

	return jiffies_to_clock_t(q->sg_timeout);
@@ -769,12 +759,6 @@ int scsi_cmd_ioctl(struct request_queue *q, struct gendisk *bd_disk, fmode_t mod 
		case SG_GET_VERSION_NUM:

			err = sg_get_version(arg);

			break;

		case SCSI_IOCTL_GET_IDLUN:

			err = scsi_get_idlun(q, arg);

			break;

		case SCSI_IOCTL_GET_BUS_NUMBER:

			err = scsi_get_bus(q, arg);

			break;

		case SG_SET_TIMEOUT:

			err = sg_set_timeout(q, arg);

			break;