summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorKeith Busch <kbusch@kernel.org>2025-08-27 07:12:57 -0700
committerJens Axboe <axboe@kernel.dk>2025-09-09 10:27:01 -0600
commit69d7ed5b9ef661230264bfa0db4c96fa25b8efa4 (patch)
treeb989cf8053c78dae0dea4f5cc33e4795e668c69d /block
parent9eab1d4e0d15b633adc170c458c51e8be3b1c553 (diff)
downloadlinux-69d7ed5b9ef661230264bfa0db4c96fa25b8efa4.tar.gz
linux-69d7ed5b9ef661230264bfa0db4c96fa25b8efa4.tar.bz2
linux-69d7ed5b9ef661230264bfa0db4c96fa25b8efa4.zip
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>
Diffstat (limited to 'block')
-rw-r--r--block/bio-integrity.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 6b077ca937f6..6d069a49b4aa 100644
--- 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;