tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Christoph Hellwig and committed by
Martin K. Petersen 08dc2f9b b2123d3b

+3 -6
+2 -3
drivers/scsi/scsi_ioctl.c
··· 530 530 * Positive numbers returned are the compacted SCSI error codes (4 531 531 * bytes in one int) where the lowest byte is the SCSI status. 532 532 */ 533 - int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 534 - struct scsi_ioctl_command __user *sic) 533 + static int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, 534 + fmode_t mode, struct scsi_ioctl_command __user *sic) 535 535 { 536 536 enum { OMAX_SB_LEN = 16 }; /* For backward compatibility */ 537 537 struct request *rq; ··· 643 643 644 644 return err; 645 645 } 646 - EXPORT_SYMBOL_GPL(sg_scsi_ioctl); 647 646 648 647 int put_sg_io_hdr(const struct sg_io_hdr *hdr, void __user *argp) 649 648 {
+1 -1
drivers/scsi/sg.c
··· 1109 1109 case SCSI_IOCTL_SEND_COMMAND: 1110 1110 if (atomic_read(&sdp->detaching)) 1111 1111 return -ENODEV; 1112 - return sg_scsi_ioctl(sdp->device->request_queue, NULL, filp->f_mode, p); 1112 + return scsi_ioctl(sdp->device, NULL, filp->f_mode, cmd_in, p); 1113 1113 case SG_SET_DEBUG: 1114 1114 result = get_user(val, ip); 1115 1115 if (result)
-2
include/scsi/scsi_ioctl.h
··· 47 47 int cmd, bool ndelay); 48 48 int scsi_ioctl(struct scsi_device *sdev, struct gendisk *disk, fmode_t mode, 49 49 int cmd, void __user *arg); 50 - int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 51 - struct scsi_ioctl_command __user *argp); 52 50 int get_sg_io_hdr(struct sg_io_hdr *hdr, const void __user *argp); 53 51 int put_sg_io_hdr(const struct sg_io_hdr *hdr, void __user *argp); 54 52 bool scsi_cmd_allowed(unsigned char *cmd, fmode_t mode);