aboutsummaryrefslogtreecommitdiffstats
path: root/fs/bio.c
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 /fs/bio.c
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 'fs/bio.c')
-rw-r--r--fs/bio.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/bio.c b/fs/bio.c
index 8754e7b6eb49..7065837ae9f3 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1003,7 +1003,7 @@ struct bio_map_data {
1003}; 1003};
1004 1004
1005static void bio_set_map_data(struct bio_map_data *bmd, struct bio *bio, 1005static void bio_set_map_data(struct bio_map_data *bmd, struct bio *bio,
1006 struct sg_iovec *iov, int iov_count, 1006 const struct sg_iovec *iov, int iov_count,
1007 int is_our_pages) 1007 int is_our_pages)
1008{ 1008{
1009 memcpy(bmd->sgvecs, iov, sizeof(struct sg_iovec) * iov_count); 1009 memcpy(bmd->sgvecs, iov, sizeof(struct sg_iovec) * iov_count);
@@ -1023,7 +1023,7 @@ static struct bio_map_data *bio_alloc_map_data(int nr_segs,
1023 sizeof(struct sg_iovec) * iov_count, gfp_mask); 1023 sizeof(struct sg_iovec) * iov_count, gfp_mask);
1024} 1024}
1025 1025
1026static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count, 1026static int __bio_copy_iov(struct bio *bio, const struct sg_iovec *iov, int iov_count,
1027 int to_user, int from_user, int do_free_page) 1027 int to_user, int from_user, int do_free_page)
1028{ 1028{
1029 int ret = 0, i; 1029 int ret = 0, i;
@@ -1121,7 +1121,7 @@ EXPORT_SYMBOL(bio_uncopy_user);
1121 */ 1121 */
1122struct bio *bio_copy_user_iov(struct request_queue *q, 1122struct bio *bio_copy_user_iov(struct request_queue *q,
1123 struct rq_map_data *map_data, 1123 struct rq_map_data *map_data,
1124 struct sg_iovec *iov, int iov_count, 1124 const struct sg_iovec *iov, int iov_count,
1125 int write_to_vm, gfp_t gfp_mask) 1125 int write_to_vm, gfp_t gfp_mask)
1126{ 1126{
1127 struct bio_map_data *bmd; 1127 struct bio_map_data *bmd;
@@ -1260,7 +1260,7 @@ EXPORT_SYMBOL(bio_copy_user);
1260 1260
1261static struct bio *__bio_map_user_iov(struct request_queue *q, 1261static struct bio *__bio_map_user_iov(struct request_queue *q,
1262 struct block_device *bdev, 1262 struct block_device *bdev,
1263 struct sg_iovec *iov, int iov_count, 1263 const struct sg_iovec *iov, int iov_count,
1264 int write_to_vm, gfp_t gfp_mask) 1264 int write_to_vm, gfp_t gfp_mask)
1265{ 1265{
1266 int i, j; 1266 int i, j;
@@ -1408,7 +1408,7 @@ EXPORT_SYMBOL(bio_map_user);
1408 * device. Returns an error pointer in case of error. 1408 * device. Returns an error pointer in case of error.
1409 */ 1409 */
1410struct bio *bio_map_user_iov(struct request_queue *q, struct block_device *bdev, 1410struct bio *bio_map_user_iov(struct request_queue *q, struct block_device *bdev,
1411 struct sg_iovec *iov, int iov_count, 1411 const struct sg_iovec *iov, int iov_count,
1412 int write_to_vm, gfp_t gfp_mask) 1412 int write_to_vm, gfp_t gfp_mask)
1413{ 1413{
1414 struct bio *bio; 1414 struct bio *bio;