block: refactor __bio_iov_bvec_add_pages (a10584c3) · Commits · 戴 / test

Return early on error, and add an unlikely annotation for that case. Reviewed-by:

block/bio.c

+9 −10

Original line number	Diff line number	Diff line
		@@ -873,7 +873,9 @@ 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);
		size = bio_add_page(bio, bv->bv_page, len,
		bv->bv_offset + iter->iov_offset);
		if (size == len) {
		if (unlikely(size != len))
		return -EINVAL;

		if (!bio_flagged(bio, BIO_NO_PAGE_REF)) {
		struct page *page;
		int i;
		@@ -886,9 +888,6 @@ static int __bio_iov_bvec_add_pages(struct bio bio, struct iov_iter iter)
		return 0;
		}

		return -EINVAL;
		}

		#define PAGE_PTRS_PER_BVEC (sizeof(struct bio_vec) / sizeof(struct page *))

		/**