blk-integrity: use simpler alignment check

We're checking length and addresses against the same alignment value, so
use the more simple iterator check.

Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 6b077ca937f6b6c826a1d801f6eb3401e83a7dad..6d069a49b4aad2924b20c3203a12cce4ede0d112 100644 (file)
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -262,7 +262,6 @@ static unsigned int bvec_from_pages(struct bio_vec *bvec, struct page **pages,
 int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
 {
        struct request_queue *q = bdev_get_queue(bio->bi_bdev);
-       unsigned int align = blk_lim_dma_alignment_and_pad(&q->limits);
        struct page *stack_pages[UIO_FASTIOV], **pages = stack_pages;
        struct bio_vec stack_vec[UIO_FASTIOV], *bvec = stack_vec;
        size_t offset, bytes = iter->count;
@@ -285,7 +284,8 @@ int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
                pages = NULL;
        }
 
-       copy = !iov_iter_is_aligned(iter, align, align);
+       copy = iov_iter_alignment(iter) &
+                       blk_lim_dma_alignment_and_pad(&q->limits);
        ret = iov_iter_extract_pages(iter, &pages, bytes, nr_vecs, 0, &offset);
        if (unlikely(ret < 0))
                goto free_bvec;