Commit 37dfe554 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] sparse: scsi ->ioctl() annotation

Low-level drivers' ->ioctl() gets a userland pointer from scsi_ioctl();
prototype annotated, so is scsi_debug instance.
parent 02bf2dff
...@@ -484,7 +484,7 @@ int scsi_debug_queuecommand(struct scsi_cmnd * SCpnt, done_funct_t done) ...@@ -484,7 +484,7 @@ int scsi_debug_queuecommand(struct scsi_cmnd * SCpnt, done_funct_t done)
return schedule_resp(SCpnt, devip, done, errsts, scsi_debug_delay); return schedule_resp(SCpnt, devip, done, errsts, scsi_debug_delay);
} }
static int scsi_debug_ioctl(struct scsi_device *dev, int cmd, void *arg) static int scsi_debug_ioctl(struct scsi_device *dev, int cmd, void __user *arg)
{ {
if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts) { if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts) {
printk(KERN_INFO "scsi_debug: ioctl: cmd=0x%x\n", cmd); printk(KERN_INFO "scsi_debug: ioctl: cmd=0x%x\n", cmd);
......
...@@ -7,7 +7,7 @@ static int scsi_debug_slave_configure(struct scsi_device *); ...@@ -7,7 +7,7 @@ static int scsi_debug_slave_configure(struct scsi_device *);
static void scsi_debug_slave_destroy(struct scsi_device *); static void scsi_debug_slave_destroy(struct scsi_device *);
static int scsi_debug_queuecommand(struct scsi_cmnd *, static int scsi_debug_queuecommand(struct scsi_cmnd *,
void (*done) (struct scsi_cmnd *)); void (*done) (struct scsi_cmnd *));
static int scsi_debug_ioctl(struct scsi_device *, int, void *); static int scsi_debug_ioctl(struct scsi_device *, int, void __user *);
static int scsi_debug_biosparam(struct scsi_device *, struct block_device *, static int scsi_debug_biosparam(struct scsi_device *, struct block_device *,
sector_t, int[]); sector_t, int[]);
static int scsi_debug_abort(struct scsi_cmnd *); static int scsi_debug_abort(struct scsi_cmnd *);
......
...@@ -64,7 +64,7 @@ struct scsi_host_template { ...@@ -64,7 +64,7 @@ struct scsi_host_template {
* *
* Status: OPTIONAL * Status: OPTIONAL
*/ */
int (* ioctl)(struct scsi_device *dev, int cmd, void *arg); int (* ioctl)(struct scsi_device *dev, int cmd, void __user *arg);
/* /*
* The queuecommand function is used to queue up a scsi * The queuecommand function is used to queue up a scsi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment