diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-18 05:39:10 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-18 05:39:10 -0400 |
| commit | b2b4b9a7c09ad66e095b13c97946a96f2dc8284e (patch) | |
| tree | fb856b5998df266bd83e6e64b8884287e812845a /include/linux/blkdev.h | |
| parent | 875999c5539999f61a45620aae0c3e5fb1d2b035 (diff) | |
| parent | 4741c336d27dec3ea68a35659abb8dc82b142388 (diff) | |
| download | blackbird-op-linux-b2b4b9a7c09ad66e095b13c97946a96f2dc8284e.tar.gz blackbird-op-linux-b2b4b9a7c09ad66e095b13c97946a96f2dc8284e.zip | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d0cac8b58de7..59e1259b1c40 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -17,6 +17,8 @@ #include <asm/scatterlist.h> +struct scsi_ioctl_command; + struct request_queue; typedef struct request_queue request_queue_t; struct elevator_queue; @@ -611,6 +613,8 @@ extern void blk_plug_device(request_queue_t *); extern int blk_remove_plug(request_queue_t *); extern void blk_recount_segments(request_queue_t *, struct bio *); extern int scsi_cmd_ioctl(struct file *, struct gendisk *, unsigned int, void __user *); +extern int sg_scsi_ioctl(struct file *, struct request_queue *, + struct gendisk *, struct scsi_ioctl_command __user *); extern void blk_start_queue(request_queue_t *q); extern void blk_stop_queue(request_queue_t *q); extern void blk_sync_queue(struct request_queue *q); |
