Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Keith Busch and committed by
Jens Axboe
69d7ed5b 9eab1d4e

+2 -2
+2 -2
block/bio-integrity.c
··· 262 262 int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter) 263 263 { 264 264 struct request_queue *q = bdev_get_queue(bio->bi_bdev); 265 - unsigned int align = blk_lim_dma_alignment_and_pad(&q->limits); 266 265 struct page *stack_pages[UIO_FASTIOV], **pages = stack_pages; 267 266 struct bio_vec stack_vec[UIO_FASTIOV], *bvec = stack_vec; 268 267 size_t offset, bytes = iter->count; ··· 284 285 pages = NULL; 285 286 } 286 287 287 - copy = !iov_iter_is_aligned(iter, align, align); 288 + copy = iov_iter_alignment(iter) & 289 + blk_lim_dma_alignment_and_pad(&q->limits); 288 290 ret = iov_iter_extract_pages(iter, &pages, bytes, nr_vecs, 0, &offset); 289 291 if (unlikely(ret < 0)) 290 292 goto free_bvec;