Merge tag 'for-linus-20181109' of git://git.kernel.dk/linux-block

[thirdparty/linux.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index 9a9c59067521304aff88b450fb8f2499bf2e7201..a50d59236b1976439e691bc0f22da002eedfd0a9 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -1254,7 +1254,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
        /*
         * success
         */
-       if (((iter->type & WRITE) && (!map_data || !map_data->null_mapped)) ||
+       if ((iov_iter_rw(iter) == WRITE && (!map_data || !map_data->null_mapped)) ||
            (map_data && map_data->from_user)) {
                ret = bio_copy_from_iter(bio, iter);
                if (ret)