diff options
| author | Roger Pau Monne <roger.pau@citrix.com> | 2015-02-02 11:28:21 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2015-02-10 16:04:45 +0000 |
| commit | 3bb8c98e5612f069010ad04e5f463389e2eb6563 (patch) | |
| tree | e667fb9a9001c954bc2f5aa3d1083c58eeae4d51 | |
| parent | bcadb699b05b828fb43c54abb75607db7e8c3e29 (diff) | |
| download | op-kernel-dev-3bb8c98e5612f069010ad04e5f463389e2eb6563.zip op-kernel-dev-3bb8c98e5612f069010ad04e5f463389e2eb6563.tar.gz | |
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: Roger Pau Monné <roger.pau@citrix.com>
Reported-and-Tested-by: Ouyang 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
| -rw-r--r-- | drivers/block/xen-blkfront.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 2236c6f..7f66d2e 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -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); |
