summaryrefslogtreecommitdiffstats
path: root/block/blk-map.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-03-22 01:06:04 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-12 04:27:13 +0200
commit8f7e885a4cc167f8b1931800fa1319772ae4b11d (patch)
treec6bda5eac7995f9330120ddafcb1afe6b9086632 /block/blk-map.c
parentsg_io(): use import_iovec() (diff)
downloadlinux-8f7e885a4cc167f8b1931800fa1319772ae4b11d.tar.xz
linux-8f7e885a4cc167f8b1931800fa1319772ae4b11d.zip
blk_rq_map_user(): use import_single_range()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'block/blk-map.c')
-rw-r--r--block/blk-map.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-map.c b/block/blk-map.c
index b8d2725324a6..da310a105429 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -124,10 +124,10 @@ int blk_rq_map_user(struct request_queue *q, struct request *rq,
{
struct iovec iov;
struct iov_iter i;
+ int ret = import_single_range(rq_data_dir(rq), ubuf, len, &iov, &i);
- iov.iov_base = ubuf;
- iov.iov_len = len;
- iov_iter_init(&i, rq_data_dir(rq), &iov, 1, len);
+ if (unlikely(ret < 0))
+ return ret;
return blk_rq_map_user_iov(q, rq, map_data, &i, gfp_mask);
}