Created
October 19, 2018 06:42
-
-
Save nathanchance/8febc92735f4228574cb0464520f0f6f to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 845b7e1af48d4b05bdcb6fe08da2e275b1352c98 | |
Author: Nathan Chancellor <natechancellor@gmail.com> | |
Date: Thu Oct 18 23:42:23 2018 -0700 | |
scsi/ata: Use unsigned int for cmd's type in scsi_host_template | |
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> | |
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c | |
index 3d4887d0e84a..7e2681c31e11 100644 | |
--- a/drivers/ata/libata-scsi.c | |
+++ b/drivers/ata/libata-scsi.c | |
@@ -778,7 +778,7 @@ static int ata_ioc32(struct ata_port *ap) | |
} | |
int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *scsidev, | |
- int cmd, void __user *arg) | |
+ unsigned int cmd, void __user *arg) | |
{ | |
unsigned long val; | |
int rc = -EINVAL; | |
@@ -829,7 +829,7 @@ int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *scsidev, | |
} | |
EXPORT_SYMBOL_GPL(ata_sas_scsi_ioctl); | |
-int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg) | |
+int ata_scsi_ioctl(struct scsi_device *scsidev, unsigned int cmd, void __user *arg) | |
{ | |
return ata_sas_scsi_ioctl(ata_shost_to_port(scsidev->host), | |
scsidev, cmd, arg); | |
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c | |
index bd7f352c28f3..a6399fac3333 100644 | |
--- a/drivers/scsi/aacraid/aachba.c | |
+++ b/drivers/scsi/aacraid/aachba.c | |
@@ -3452,7 +3452,7 @@ static int delete_disk(struct aac_dev *dev, void __user *arg) | |
} | |
} | |
-int aac_dev_ioctl(struct aac_dev *dev, int cmd, void __user *arg) | |
+int aac_dev_ioctl(struct aac_dev *dev, unsigned int cmd, void __user *arg) | |
{ | |
switch (cmd) { | |
case FSACTL_QUERY_DISK: | |
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h | |
index 39eb415987fc..d84bedbb5f05 100644 | |
--- a/drivers/scsi/aacraid/aacraid.h | |
+++ b/drivers/scsi/aacraid/aacraid.h | |
@@ -2705,12 +2705,12 @@ void aac_set_intx_mode(struct aac_dev *dev); | |
int aac_get_config_status(struct aac_dev *dev, int commit_flag); | |
int aac_get_containers(struct aac_dev *dev); | |
int aac_scsi_cmd(struct scsi_cmnd *cmd); | |
-int aac_dev_ioctl(struct aac_dev *dev, int cmd, void __user *arg); | |
+int aac_dev_ioctl(struct aac_dev *dev, unsigned int cmd, void __user *arg); | |
#ifndef shost_to_class | |
#define shost_to_class(shost) &shost->shost_dev | |
#endif | |
ssize_t aac_get_serial_number(struct device *dev, char *buf); | |
-int aac_do_ioctl(struct aac_dev * dev, int cmd, void __user *arg); | |
+int aac_do_ioctl(struct aac_dev * dev, unsigned int cmd, void __user *arg); | |
int aac_rx_init(struct aac_dev *dev); | |
int aac_rkt_init(struct aac_dev *dev); | |
int aac_nark_init(struct aac_dev *dev); | |
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c | |
index 25f6600d6c09..082f7914b84b 100644 | |
--- a/drivers/scsi/aacraid/commctrl.c | |
+++ b/drivers/scsi/aacraid/commctrl.c | |
@@ -1061,7 +1061,7 @@ static int aac_send_reset_adapter(struct aac_dev *dev, void __user *arg) | |
return retval; | |
} | |
-int aac_do_ioctl(struct aac_dev * dev, int cmd, void __user *arg) | |
+int aac_do_ioctl(struct aac_dev * dev, unsigned int cmd, void __user *arg) | |
{ | |
int status; | |
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c | |
index 2d4e4ddc5ace..d6fef7e38d24 100644 | |
--- a/drivers/scsi/aacraid/linit.c | |
+++ b/drivers/scsi/aacraid/linit.c | |
@@ -616,7 +616,7 @@ static struct device_attribute *aac_dev_attrs[] = { | |
NULL, | |
}; | |
-static int aac_ioctl(struct scsi_device *sdev, int cmd, void __user * arg) | |
+static int aac_ioctl(struct scsi_device *sdev, unsigned int cmd, void __user * arg) | |
{ | |
struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata; | |
if (!capable(CAP_SYS_RAWIO)) | |
@@ -1205,7 +1205,7 @@ static long aac_compat_do_ioctl(struct aac_dev *dev, unsigned cmd, unsigned long | |
return ret; | |
} | |
-static int aac_compat_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) | |
+static int aac_compat_ioctl(struct scsi_device *sdev, unsigned int cmd, void __user *arg) | |
{ | |
struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata; | |
if (!capable(CAP_SYS_RAWIO)) | |
diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c | |
index acac6152f50b..c80b7dd50f33 100644 | |
--- a/drivers/scsi/cxlflash/superpipe.c | |
+++ b/drivers/scsi/cxlflash/superpipe.c | |
@@ -1924,7 +1924,7 @@ static int cxlflash_disk_verify(struct scsi_device *sdev, | |
* | |
* Return: A string identifying the decoded ioctl. | |
*/ | |
-static char *decode_ioctl(int cmd) | |
+static char *decode_ioctl(unsigned int cmd) | |
{ | |
switch (cmd) { | |
case DK_CXLFLASH_ATTACH: | |
@@ -2051,7 +2051,7 @@ static int cxlflash_disk_direct_open(struct scsi_device *sdev, void *arg) | |
* | |
* Return: 0 on success, -errno on failure | |
*/ | |
-static int ioctl_common(struct scsi_device *sdev, int cmd) | |
+static int ioctl_common(struct scsi_device *sdev, unsigned int cmd) | |
{ | |
struct cxlflash_cfg *cfg = shost_priv(sdev->host); | |
struct device *dev = &cfg->dev->dev; | |
@@ -2096,7 +2096,7 @@ static int ioctl_common(struct scsi_device *sdev, int cmd) | |
* | |
* Return: 0 on success, -errno on failure | |
*/ | |
-int cxlflash_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) | |
+int cxlflash_ioctl(struct scsi_device *sdev, unsigned int cmd, void __user *arg) | |
{ | |
typedef int (*sioctl) (struct scsi_device *, void *); | |
@@ -2180,7 +2180,7 @@ int cxlflash_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) | |
if (unlikely(copy_from_user(&buf, arg, size))) { | |
dev_err(dev, "%s: copy_from_user() fail " | |
- "size=%lu cmd=%d (%s) arg=%p\n", | |
+ "size=%lu cmd=%u (%s) arg=%p\n", | |
__func__, size, cmd, decode_ioctl(cmd), arg); | |
rc = -EFAULT; | |
goto cxlflash_ioctl_exit; | |
@@ -2204,7 +2204,7 @@ int cxlflash_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) | |
if (likely(!rc)) | |
if (unlikely(copy_to_user(arg, &buf, size))) { | |
dev_err(dev, "%s: copy_to_user() fail " | |
- "size=%lu cmd=%d (%s) arg=%p\n", | |
+ "size=%lu cmd=%u (%s) arg=%p\n", | |
__func__, size, cmd, decode_ioctl(cmd), arg); | |
rc = -EFAULT; | |
} | |
diff --git a/drivers/scsi/esas2r/esas2r.h b/drivers/scsi/esas2r/esas2r.h | |
index 858c3b33db78..7f43b95f4e94 100644 | |
--- a/drivers/scsi/esas2r/esas2r.h | |
+++ b/drivers/scsi/esas2r/esas2r.h | |
@@ -965,8 +965,8 @@ struct esas2r_adapter { | |
const char *esas2r_info(struct Scsi_Host *); | |
int esas2r_write_params(struct esas2r_adapter *a, struct esas2r_request *rq, | |
struct esas2r_sas_nvram *data); | |
-int esas2r_ioctl_handler(void *hostdata, int cmd, void __user *arg); | |
-int esas2r_ioctl(struct scsi_device *dev, int cmd, void __user *arg); | |
+int esas2r_ioctl_handler(void *hostdata, unsigned int cmd, void __user *arg); | |
+int esas2r_ioctl(struct scsi_device *dev, unsigned int cmd, void __user *arg); | |
u8 handle_hba_ioctl(struct esas2r_adapter *a, | |
struct atto_ioctl *ioctl_hba); | |
int esas2r_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd); | |
diff --git a/drivers/scsi/esas2r/esas2r_ioctl.c b/drivers/scsi/esas2r/esas2r_ioctl.c | |
index 34bcc8c04ff4..14d32fb0ccf4 100644 | |
--- a/drivers/scsi/esas2r/esas2r_ioctl.c | |
+++ b/drivers/scsi/esas2r/esas2r_ioctl.c | |
@@ -1274,7 +1274,7 @@ int esas2r_write_params(struct esas2r_adapter *a, struct esas2r_request *rq, | |
/* This function only cares about ATTO-specific ioctls (atto_express_ioctl) */ | |
-int esas2r_ioctl_handler(void *hostdata, int cmd, void __user *arg) | |
+int esas2r_ioctl_handler(void *hostdata, unsigned int cmd, void __user *arg) | |
{ | |
struct atto_express_ioctl *ioctl = NULL; | |
struct esas2r_adapter *a; | |
@@ -1292,7 +1292,7 @@ int esas2r_ioctl_handler(void *hostdata, int cmd, void __user *arg) | |
ioctl = memdup_user(arg, sizeof(struct atto_express_ioctl)); | |
if (IS_ERR(ioctl)) { | |
esas2r_log(ESAS2R_LOG_WARN, | |
- "ioctl_handler access_ok failed for cmd %d, " | |
+ "ioctl_handler access_ok failed for cmd %u, " | |
"address %p", cmd, | |
arg); | |
return PTR_ERR(ioctl); | |
@@ -1493,7 +1493,7 @@ int esas2r_ioctl_handler(void *hostdata, int cmd, void __user *arg) | |
ioctl_done: | |
if (err < 0) { | |
- esas2r_log(ESAS2R_LOG_WARN, "err %d on ioctl cmd %d", err, | |
+ esas2r_log(ESAS2R_LOG_WARN, "err %d on ioctl cmd %u", err, | |
cmd); | |
switch (err) { | |
@@ -1519,7 +1519,7 @@ int esas2r_ioctl_handler(void *hostdata, int cmd, void __user *arg) | |
if (err != 0) { | |
esas2r_log(ESAS2R_LOG_WARN, | |
"ioctl_handler copy_to_user didn't copy " | |
- "everything (err %d, cmd %d)", err, | |
+ "everything (err %d, cmd %u)", err, | |
cmd); | |
kfree(ioctl); | |
@@ -1531,7 +1531,7 @@ int esas2r_ioctl_handler(void *hostdata, int cmd, void __user *arg) | |
return 0; | |
} | |
-int esas2r_ioctl(struct scsi_device *sd, int cmd, void __user *arg) | |
+int esas2r_ioctl(struct scsi_device *sd, unsigned int cmd, void __user *arg) | |
{ | |
return esas2r_ioctl_handler(sd->host->hostdata, cmd, arg); | |
} | |
diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c | |
index c07118617d89..25dc8d44ed8e 100644 | |
--- a/drivers/scsi/esas2r/esas2r_main.c | |
+++ b/drivers/scsi/esas2r/esas2r_main.c | |
@@ -624,7 +624,7 @@ static int esas2r_proc_major; | |
long esas2r_proc_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) | |
{ | |
return esas2r_ioctl_handler(esas2r_proc_host->hostdata, | |
- (int)cmd, (void __user *)arg); | |
+ cmd, (void __user *)arg); | |
} | |
static void __exit esas2r_exit(void) | |
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c | |
index c9cccf35e9d7..2d7fcb911e62 100644 | |
--- a/drivers/scsi/hpsa.c | |
+++ b/drivers/scsi/hpsa.c | |
@@ -251,10 +251,10 @@ static int number_of_controllers; | |
static irqreturn_t do_hpsa_intr_intx(int irq, void *dev_id); | |
static irqreturn_t do_hpsa_intr_msi(int irq, void *dev_id); | |
-static int hpsa_ioctl(struct scsi_device *dev, int cmd, void __user *arg); | |
+static int hpsa_ioctl(struct scsi_device *dev, unsigned int cmd, void __user *arg); | |
#ifdef CONFIG_COMPAT | |
-static int hpsa_compat_ioctl(struct scsi_device *dev, int cmd, | |
+static int hpsa_compat_ioctl(struct scsi_device *dev, unsigned int cmd, | |
void __user *arg); | |
#endif | |
@@ -6123,7 +6123,7 @@ static void cmd_free(struct ctlr_info *h, struct CommandList *c) | |
#ifdef CONFIG_COMPAT | |
-static int hpsa_ioctl32_passthru(struct scsi_device *dev, int cmd, | |
+static int hpsa_ioctl32_passthru(struct scsi_device *dev, unsigned int cmd, | |
void __user *arg) | |
{ | |
IOCTL32_Command_struct __user *arg32 = | |
@@ -6160,7 +6160,7 @@ static int hpsa_ioctl32_passthru(struct scsi_device *dev, int cmd, | |
} | |
static int hpsa_ioctl32_big_passthru(struct scsi_device *dev, | |
- int cmd, void __user *arg) | |
+ unsigned int cmd, void __user *arg) | |
{ | |
BIG_IOCTL32_Command_struct __user *arg32 = | |
(BIG_IOCTL32_Command_struct __user *) arg; | |
@@ -6197,7 +6197,7 @@ static int hpsa_ioctl32_big_passthru(struct scsi_device *dev, | |
return err; | |
} | |
-static int hpsa_compat_ioctl(struct scsi_device *dev, int cmd, void __user *arg) | |
+static int hpsa_compat_ioctl(struct scsi_device *dev, unsigned int cmd, void __user *arg) | |
{ | |
switch (cmd) { | |
case CCISS_GETPCIINFO: | |
@@ -6517,7 +6517,7 @@ static void check_ioctl_unit_attention(struct ctlr_info *h, | |
/* | |
* ioctl | |
*/ | |
-static int hpsa_ioctl(struct scsi_device *dev, int cmd, void __user *arg) | |
+static int hpsa_ioctl(struct scsi_device *dev, unsigned int cmd, void __user *arg) | |
{ | |
struct ctlr_info *h; | |
void __user *argp = (void __user *)arg; | |
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c | |
index 271990bc065b..d885fdda0a7e 100644 | |
--- a/drivers/scsi/ipr.c | |
+++ b/drivers/scsi/ipr.c | |
@@ -6696,7 +6696,7 @@ static int ipr_queuecommand(struct Scsi_Host *shost, | |
* Return value: | |
* 0 on success / other on failure | |
**/ | |
-static int ipr_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) | |
+static int ipr_ioctl(struct scsi_device *sdev, unsigned int cmd, void __user *arg) | |
{ | |
struct ipr_resource_entry *res; | |
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c | |
index 33229348dcb6..4eeaafbe0504 100644 | |
--- a/drivers/scsi/libsas/sas_scsi_host.c | |
+++ b/drivers/scsi/libsas/sas_scsi_host.c | |
@@ -805,7 +805,7 @@ void sas_scsi_recover_host(struct Scsi_Host *shost) | |
shost->host_failed, tries); | |
} | |
-int sas_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) | |
+int sas_ioctl(struct scsi_device *sdev, unsigned int cmd, void __user *arg) | |
{ | |
struct domain_device *dev = sdev_to_domain_dev(sdev); | |
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c | |
index 60bcc6df97a9..eb88403b8df1 100644 | |
--- a/drivers/scsi/scsi_debug.c | |
+++ b/drivers/scsi/scsi_debug.c | |
@@ -836,7 +836,7 @@ static void mk_sense_invalid_opcode(struct scsi_cmnd *scp) | |
mk_sense_buffer(scp, ILLEGAL_REQUEST, INVALID_OPCODE, 0); | |
} | |
-static int scsi_debug_ioctl(struct scsi_device *dev, int cmd, void __user *arg) | |
+static int scsi_debug_ioctl(struct scsi_device *dev, unsigned int cmd, void __user *arg) | |
{ | |
if (sdebug_verbose) { | |
if (0x1261 == cmd) | |
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c | |
index a25a07a0b7f0..ffef262e0070 100644 | |
--- a/drivers/scsi/smartpqi/smartpqi_init.c | |
+++ b/drivers/scsi/smartpqi/smartpqi_init.c | |
@@ -5572,7 +5572,7 @@ static int pqi_passthru_ioctl(struct pqi_ctrl_info *ctrl_info, void __user *arg) | |
return rc; | |
} | |
-static int pqi_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) | |
+static int pqi_ioctl(struct scsi_device *sdev, unsigned int cmd, void __user *arg) | |
{ | |
int rc; | |
struct pqi_ctrl_info *ctrl_info; | |
diff --git a/include/linux/libata.h b/include/linux/libata.h | |
index 38c95d66ab12..f429872fa822 100644 | |
--- a/include/linux/libata.h | |
+++ b/include/linux/libata.h | |
@@ -1123,10 +1123,10 @@ extern int ata_host_activate(struct ata_host *host, int irq, | |
extern void ata_host_detach(struct ata_host *host); | |
extern void ata_host_init(struct ata_host *, struct device *, struct ata_port_operations *); | |
extern int ata_scsi_detect(struct scsi_host_template *sht); | |
-extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); | |
+extern int ata_scsi_ioctl(struct scsi_device *dev, unsigned int cmd, void __user *arg); | |
extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd); | |
extern int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *dev, | |
- int cmd, void __user *arg); | |
+ unsigned int cmd, void __user *arg); | |
extern void ata_sas_port_destroy(struct ata_port *); | |
extern struct ata_port *ata_sas_port_alloc(struct ata_host *, | |
struct ata_port_info *, struct Scsi_Host *); | |
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h | |
index 3de3b10da19a..6f46d43c2ca0 100644 | |
--- a/include/scsi/libsas.h | |
+++ b/include/scsi/libsas.h | |
@@ -709,7 +709,7 @@ int sas_eh_target_reset_handler(struct scsi_cmnd *cmd); | |
extern void sas_target_destroy(struct scsi_target *); | |
extern int sas_slave_alloc(struct scsi_device *); | |
-extern int sas_ioctl(struct scsi_device *sdev, int cmd, void __user *arg); | |
+extern int sas_ioctl(struct scsi_device *sdev, unsigned int cmd, void __user *arg); | |
extern int sas_drain_work(struct sas_ha_struct *ha); | |
extern void sas_ssp_task_response(struct device *dev, struct sas_task *task, | |
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h | |
index 5ea06d310a25..9e02dff44cd2 100644 | |
--- a/include/scsi/scsi_host.h | |
+++ b/include/scsi/scsi_host.h | |
@@ -65,7 +65,7 @@ struct scsi_host_template { | |
* | |
* Status: OPTIONAL | |
*/ | |
- int (* ioctl)(struct scsi_device *dev, int cmd, void __user *arg); | |
+ int (* ioctl)(struct scsi_device *dev, unsigned int cmd, void __user *arg); | |
#ifdef CONFIG_COMPAT | |
@@ -75,7 +75,7 @@ struct scsi_host_template { | |
* | |
* Status: OPTIONAL | |
*/ | |
- int (* compat_ioctl)(struct scsi_device *dev, int cmd, void __user *arg); | |
+ int (* compat_ioctl)(struct scsi_device *dev, unsigned int cmd, void __user *arg); | |
#endif | |
/* |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment