Commit 69d7ed5b authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

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: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9eab1d4e

block/bio-integrity.c

+2 −2
Original line number Diff line number Diff line
@@ -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;