aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-02-08 20:42:52 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-04-01 23:19:31 -0400
commit86d564c84c38b1ec06d9f2120d6a7373dcaeff0c (patch)
tree4beaed1ab50eada4439301c72260d99419fd71e5 /include/linux
parent480f40de91e74190281309fd0ecb2d0414603c2e (diff)
constify blk_rq_map_user_iov() and friends
sg_iovec array passed to it can be const Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/bio.h5
-rw-r--r--include/linux/blkdev.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 5a4d39b4686b..21e27208316c 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -388,7 +388,7 @@ struct sg_iovec;
388struct rq_map_data; 388struct rq_map_data;
389extern struct bio *bio_map_user_iov(struct request_queue *, 389extern struct bio *bio_map_user_iov(struct request_queue *,
390 struct block_device *, 390 struct block_device *,
391 struct sg_iovec *, int, int, gfp_t); 391 const struct sg_iovec *, int, int, gfp_t);
392extern void bio_unmap_user(struct bio *); 392extern void bio_unmap_user(struct bio *);
393extern struct bio *bio_map_kern(struct request_queue *, void *, unsigned int, 393extern struct bio *bio_map_kern(struct request_queue *, void *, unsigned int,
394 gfp_t); 394 gfp_t);
@@ -414,7 +414,8 @@ extern int bio_alloc_pages(struct bio *bio, gfp_t gfp);
414extern struct bio *bio_copy_user(struct request_queue *, struct rq_map_data *, 414extern struct bio *bio_copy_user(struct request_queue *, struct rq_map_data *,
415 unsigned long, unsigned int, int, gfp_t); 415 unsigned long, unsigned int, int, gfp_t);
416extern struct bio *bio_copy_user_iov(struct request_queue *, 416extern struct bio *bio_copy_user_iov(struct request_queue *,
417 struct rq_map_data *, struct sg_iovec *, 417 struct rq_map_data *,
418 const struct sg_iovec *,
418 int, int, gfp_t); 419 int, int, gfp_t);
419extern int bio_uncopy_user(struct bio *); 420extern int bio_uncopy_user(struct bio *);
420void zero_fill_bio(struct bio *bio); 421void zero_fill_bio(struct bio *bio);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 4afa4f8f6090..a639fd8a6d7b 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -823,8 +823,8 @@ extern int blk_rq_map_user(struct request_queue *, struct request *,
823extern int blk_rq_unmap_user(struct bio *); 823extern int blk_rq_unmap_user(struct bio *);
824extern int blk_rq_map_kern(struct request_queue *, struct request *, void *, unsigned int, gfp_t); 824extern int blk_rq_map_kern(struct request_queue *, struct request *, void *, unsigned int, gfp_t);
825extern int blk_rq_map_user_iov(struct request_queue *, struct request *, 825extern int blk_rq_map_user_iov(struct request_queue *, struct request *,
826 struct rq_map_data *, struct sg_iovec *, int, 826 struct rq_map_data *, const struct sg_iovec *,
827 unsigned int, gfp_t); 827 int, unsigned int, gfp_t);
828extern int blk_execute_rq(struct request_queue *, struct gendisk *, 828extern int blk_execute_rq(struct request_queue *, struct gendisk *,
829 struct request *, int); 829 struct request *, int);
830extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *, 830extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *,