Commit e29b3284 authored Dec 23, 2021 by Juergen Gross Committed by Greg Kroah-Hartman Dec 29, 2021

xen/blkfront: fix bug in backported patch



The backport of commit 8f5a695d99000fc ("xen/blkfront: don't take local
copy of a request from the ring page") to stable 4.4 kernel introduced
a bug when adding the needed blkif_ring_get_request() function, as
info->ring.req_prod_pvt was incremented twice now.

Fix that be deleting the now superfluous increments after calling that
function.

Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6be3251e

drivers/block/xen-blkfront.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -493,8 +493,6 @@ static int blkif_queue_discard_req(struct request *req)
		else
		ring_req->u.discard.flag = 0;

		info->ring.req_prod_pvt++;

		/* Copy the request to the ring page. */
		final_ring_req = ring_req;
		info->shadow[id].inflight = true;
		@@ -711,8 +709,6 @@ static int blkif_queue_rw_req(struct request *req)
		if (setup.segments)
		kunmap_atomic(setup.segments);

		info->ring.req_prod_pvt++;

		/* Copy request(s) to the ring page. */
		final_ring_req = ring_req;
		info->shadow[id].inflight = true;