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

Commit 3bb8c98e authored by Roger Pau Monne's avatar Roger Pau Monne Committed by David Vrabel
Browse files

xen-blkfront: fix accounting of reqs when migrating 



Current migration code uses blk_put_request in order to finish a request
before requeuing it. This function doesn't update the statistics of the
queue, which completely screws accounting. Use blk_end_request_all instead
which properly updates the statistics of the queue.

Signed-off-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
Reported-and-Tested-by: default avatarOuyang Zhaowei (Charles) <ouyangzhaowei@huawei.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: xen-devel@lists.xenproject.org
parent bcadb699

drivers/block/xen-blkfront.c

+2 −2
Original line number Diff line number Diff line
@@ -1511,7 +1511,7 @@ static int blkif_recover(struct blkfront_info *info) 
		merge_bio.tail = copy[i].request->biotail;

		bio_list_merge(&bio_list, &merge_bio);

		copy[i].request->bio = NULL;

		blk_put_request(copy[i].request);

		blk_end_request_all(copy[i].request, 0);

	}



	kfree(copy);
@@ -1534,7 +1534,7 @@ static int blkif_recover(struct blkfront_info *info) 
		req->bio = NULL;

		if (req->cmd_flags & (REQ_FLUSH | REQ_FUA))

			pr_alert("diskcache flush request found!\n");

		__blk_put_request(info->rq, req);

		__blk_end_request_all(req, 0);

	}

	spin_unlock_irq(&info->io_lock);