block: handle the null_mapped flag correctly in blk_rq_map_user_iov

[mirror_ubuntu-artful-kernel.git] / block / blk-map.c

diff --git a/block/blk-map.c b/block/blk-map.c
index 0f22911f17dc42f8e969c9f69a2d493c7821b16a..b8d2725324a6b88391db4c8a5daf7a9c1309dd86 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -93,6 +93,9 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
        if (IS_ERR(bio))
                return PTR_ERR(bio);
 
+       if (map_data && map_data->null_mapped)
+               bio->bi_flags |= (1 << BIO_NULL_MAPPED);
+
        if (bio->bi_iter.bi_size != iter->count) {
                /*
                 * Grab an extra reference to this bio, as bio_unmap_user()