Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 13:43:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block: refactor __bio_iov_bvec_add_pages

Browse Source 
Return early on error, and add an unlikely annotation for that case.

Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2019-04-11 08:23:28 +02:00 committed by Jens Axboe
parent 8a96a0e408
commit a10584c3cd
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
block/bio.c
View File

@ -873,20 +873,19 @@ static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
len = min_t(size_t, bv->bv_len - iter->iov_offset, iter->count); len = min_t(size_t, bv->bv_len - iter->iov_offset, iter->count);
size = bio_add_page(bio, bv->bv_page, len, size = bio_add_page(bio, bv->bv_page, len,
bv->bv_offset + iter->iov_offset); bv->bv_offset + iter->iov_offset);
if (size == len) { if (unlikely(size != len))
if (!bio_flagged(bio, BIO_NO_PAGE_REF)) { return -EINVAL;
struct page *page;
int i;
mp_bvec_for_each_page(page, bv, i) if (!bio_flagged(bio, BIO_NO_PAGE_REF)) {
get_page(page); struct page *page;
} int i;
iov_iter_advance(iter, size); mp_bvec_for_each_page(page, bv, i)
return 0; get_page(page);
} }
return -EINVAL; iov_iter_advance(iter, size);
return 0;
} }
#define PAGE_PTRS_PER_BVEC (sizeof(struct bio_vec) / sizeof(struct page *)) #define PAGE_PTRS_PER_BVEC (sizeof(struct bio_vec) / sizeof(struct page *))