Merge tag 'kvm-arm-for-4.3-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / block / blk-map.c

diff --git a/block/blk-map.c b/block/blk-map.c
index da310a1054299720d1b809d4ac3fd27af02b1e19..233841644c9d3ab31c6b388db5fd74cb4976c270 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -94,7 +94,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
                return PTR_ERR(bio);
 
        if (map_data && map_data->null_mapped)
-               bio->bi_flags |= (1 << BIO_NULL_MAPPED);
+               bio_set_flag(bio, BIO_NULL_MAPPED);
 
        if (bio->bi_iter.bi_size != iter->count) {
                /*
@@ -103,7 +103,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
                 * normal IO completion path
                 */
                bio_get(bio);
-               bio_endio(bio, 0);
+               bio_endio(bio);
                __blk_rq_unmap_user(bio);
                return -EINVAL;
        }