diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-28 10:43:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-28 10:43:07 -0500 |
| commit | 31151ba2cef171344beac254e65bd7e00138bb0d (patch) | |
| tree | a8f9cd3c0395656d974125c0ca7ed635aacddeee /include/linux/blkdev.h | |
| parent | 3d52acb34247816c453f94596e6c7fc4499b76dc (diff) | |
| parent | 73747aed04d3b3fb694961d025f81863b99c6898 (diff) | |
| download | lwn-31151ba2cef171344beac254e65bd7e00138bb0d.tar.gz lwn-31151ba2cef171344beac254e65bd7e00138bb0d.zip | |
fix mismerge in ll_rw_blk.c
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 19bd8e7e11bf..aefa26fbae8a 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -563,10 +563,12 @@ extern void blk_sync_queue(struct request_queue *q); extern void __blk_stop_queue(request_queue_t *q); extern void blk_run_queue(request_queue_t *); extern void blk_queue_activity_fn(request_queue_t *, activity_fn *, void *); -extern struct request *blk_rq_map_user(request_queue_t *, int, void __user *, unsigned int); -extern int blk_rq_unmap_user(struct request *, struct bio *, unsigned int); -extern int blk_execute_rq(request_queue_t *, struct gendisk *, struct request *); - +extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned int); +extern int blk_rq_unmap_user(struct bio *, unsigned int); +extern int blk_rq_map_kern(request_queue_t *, struct request *, void *, unsigned int, unsigned int); +extern int blk_rq_map_user_iov(request_queue_t *, struct request *, struct sg_iovec *, int); +extern int blk_execute_rq(request_queue_t *, struct gendisk *, + struct request *, int); static inline request_queue_t *bdev_get_queue(struct block_device *bdev) { return bdev->bd_disk->queue; |