diff options
| author | James Bottomley <jejb@mulgrave.(none)> | 2002-11-20 01:54:38 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2002-11-20 01:54:38 -0600 |
| commit | 2983e9a6aaedc96e6dff1f71a08c86b897b25e59 (patch) | |
| tree | cb0589e696fe382fa3acd50675069bb31476137f /include | |
| parent | 37256d28aacf841a25c62910abf586bd271e9632 (diff) | |
| parent | d67cf4438388d6b243ab86b0d6d9a467b6d272b4 (diff) | |
Merge mulgrave.(none):/home/jejb/BK/scsi-misc-2.5
into mulgrave.(none):/home/jejb/BK/scsi-for-linus-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 1 | ||||
| -rw-r--r-- | include/scsi/scsi_ioctl.h | 20 |
2 files changed, 10 insertions, 11 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d9b416ebc966..6730edd230e0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -321,6 +321,7 @@ extern int scsi_cmd_ioctl(struct block_device *, unsigned int, unsigned long); extern void blk_start_queue(request_queue_t *q); extern void blk_stop_queue(request_queue_t *q); extern void __blk_stop_queue(request_queue_t *q); +extern void __blk_run_queue(request_queue_t *q); static inline request_queue_t *bdev_get_queue(struct block_device *bdev) { diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h index 937cadfb917c..316c2fa044ba 100644 --- a/include/scsi/scsi_ioctl.h +++ b/include/scsi/scsi_ioctl.h @@ -17,6 +17,8 @@ #ifdef __KERNEL__ +struct scsi_device; + /* * Structures used for scsi_ioctl et al. */ @@ -33,19 +35,15 @@ typedef struct scsi_idlun { } Scsi_Idlun; /* Fibre Channel WWN, port_id struct */ -typedef struct scsi_fctargaddress -{ +typedef struct scsi_fctargaddress { __u32 host_port_id; unsigned char host_wwn[8]; // include NULL term. } Scsi_FCTargAddress; -extern int scsi_ioctl (Scsi_Device *dev, int cmd, void *arg); -extern int kernel_scsi_ioctl (Scsi_Device *dev, int cmd, void *arg); -extern int scsi_ioctl_send_command(Scsi_Device *dev, - Scsi_Ioctl_Command *arg); - -#endif - -#endif - +extern int scsi_ioctl(struct scsi_device *, int, void *); +extern int kernel_scsi_ioctl(struct scsi_device *, int , void *); +extern int scsi_ioctl_send_command(struct scsi_device *, + struct scsi_ioctl_command *); +#endif /* __KERNEL__ */ +#endif /* _SCSI_IOCTL_H */ |