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

scsi: scsi_ioctl: Unexport sg_scsi_ioctl() 

Just call scsi_ioctl() in sg as that has the same effect.

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


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

drivers/scsi/scsi_ioctl.c

+2 −3
Original line number Diff line number Diff line
@@ -530,8 +530,8 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 
 *      Positive numbers returned are the compacted SCSI error codes (4

 *      bytes in one int) where the lowest byte is the SCSI status.

 */

int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,

		struct scsi_ioctl_command __user *sic)

static int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk,

		fmode_t mode, struct scsi_ioctl_command __user *sic)

{

	enum { OMAX_SB_LEN = 16 };	/* For backward compatibility */

	struct request *rq;
@@ -643,7 +643,6 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 


	return err;

}

EXPORT_SYMBOL_GPL(sg_scsi_ioctl);



int put_sg_io_hdr(const struct sg_io_hdr *hdr, void __user *argp)

{

drivers/scsi/sg.c

+1 −1
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ sg_ioctl_common(struct file *filp, Sg_device *sdp, Sg_fd *sfp, 
	case SCSI_IOCTL_SEND_COMMAND:

		if (atomic_read(&sdp->detaching))

			return -ENODEV;

		return sg_scsi_ioctl(sdp->device->request_queue, NULL, filp->f_mode, p);

		return scsi_ioctl(sdp->device, NULL, filp->f_mode, cmd_in, p);

	case SG_SET_DEBUG:

		result = get_user(val, ip);

		if (result)

include/scsi/scsi_ioctl.h

+0 −2
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ int scsi_ioctl_block_when_processing_errors(struct scsi_device *sdev, 
		int cmd, bool ndelay);

int scsi_ioctl(struct scsi_device *sdev, struct gendisk *disk, fmode_t mode,

		int cmd, void __user *arg);

int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,

			 struct scsi_ioctl_command __user *argp);

int get_sg_io_hdr(struct sg_io_hdr *hdr, const void __user *argp);

int put_sg_io_hdr(const struct sg_io_hdr *hdr, void __user *argp);

bool scsi_cmd_allowed(unsigned char *cmd, fmode_t mode);