cls_can: Stop using NLA_PUT*()

[lisovros/linux_canprio.git] / block / blk-map.c

diff --git a/block/blk-map.c b/block/blk-map.c
index c65d7593f7f1deba5511347ceeb6dd5c881e5b3c..267a57b770994eb150d12597a4c670a9a3c5a508 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -205,6 +205,8 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
                        unaligned = 1;
                        break;
                }
+               if (!iov[i].iov_len)
+                       return -EINVAL;
        }
 
        if (unaligned || (q->dma_pad_mask & len) || map_data)
@@ -307,7 +309,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
                return PTR_ERR(bio);
 
        if (rq_data_dir(rq) == WRITE)
-               bio->bi_rw |= (1 << REQ_WRITE);
+               bio->bi_rw |= REQ_WRITE;
 
        if (do_copy)
                rq->cmd_flags |= REQ_COPY_USER;