diff options
| author | Patrick Mansfield <patmans@us.ibm.com> | 2004-02-01 22:53:17 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2004-02-01 22:53:17 -0600 |
| commit | 807adbc535f8ae97c4b71c0ae8b9823ca809558d (patch) | |
| tree | 2d7644181de71a6fad02d2767b190633cd46fde5 /include/linux/blkdev.h | |
| parent | 520bf00fb2fe57530111fb5f6f9896cbd9124b08 (diff) | |
[PATCH] change scsi_cmd_ioctl to take a gendisk instead of a queue
This patch against a recent bk 2.6 changes scsi_cmd_ioctl to take a
gendisk as an argument instead of a request_queue_t. This allows scsi char
devices to use the scsi_cmd_ioctl interface.
In turn, change bio_map_user to also pass a request_queue_t, and add a
__bio_add_page helper that takes a request_queue_t.
Tested ide cd burning with no problems.
If the scsi upper level scsi_cmd_ioctl usage were consolidated in
scsi_prep_fn, we could pass a request_queue_t instead of a gendisk to
scsi_cmd_ioctl.
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d0ba766eca75..e4aa5cfac38c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -508,7 +508,7 @@ extern int blk_remove_plug(request_queue_t *); extern void blk_recount_segments(request_queue_t *, struct bio *); extern inline int blk_phys_contig_segment(request_queue_t *q, struct bio *, struct bio *); extern inline int blk_hw_contig_segment(request_queue_t *q, struct bio *, struct bio *); -extern int scsi_cmd_ioctl(struct block_device *, unsigned int, unsigned long); +extern int scsi_cmd_ioctl(struct gendisk *, 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); |