Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06efffda authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

block: drbd: remove impossible failure handling 



For a non-cloned bio, bio_add_page() only returns failure when
the io vec table is full, but in that case, bio->bi_vcnt can't
be zero at all.

So remove the impossible failure handling.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarMing Lei <tom.leiming@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 3a83f467

drivers/block/drbd/drbd_receiver.c

+1 −13
Original line number Diff line number Diff line
@@ -1648,20 +1648,8 @@ int drbd_submit_peer_request(struct drbd_device *device, 


	page_chain_for_each(page) {

		unsigned len = min_t(unsigned, data_size, PAGE_SIZE);

		if (!bio_add_page(bio, page, len, 0)) {

			/* A single page must always be possible!

			 * But in case it fails anyways,

			 * we deal with it, and complain (below). */

			if (bio->bi_vcnt == 0) {

				drbd_err(device,

					"bio_add_page failed for len=%u, "

					"bi_vcnt=0 (bi_sector=%llu)\n",

					len, (uint64_t)bio->bi_iter.bi_sector);

				err = -ENOSPC;

				goto fail;

			}

		if (!bio_add_page(bio, page, len, 0))

			goto next_bio;

		}

		data_size -= len;

		sector += len >> 9;

		--nr_pages;