diff options
| author | grehan <grehan@FreeBSD.org> | 2012-04-16 18:29:12 +0000 |
|---|---|---|
| committer | grehan <grehan@FreeBSD.org> | 2012-04-16 18:29:12 +0000 |
| commit | 1cae003d3852773a1d76e2d5b755178886b68178 (patch) | |
| tree | 1eef229bc2dfb6e3be4c7c5f37387a743cb72ccc | |
| parent | 910f312b325a2c6d4c54949fe821672926d11609 (diff) | |
| download | FreeBSD-src-1cae003d3852773a1d76e2d5b755178886b68178.zip FreeBSD-src-1cae003d3852773a1d76e2d5b755178886b68178.tar.gz | |
Sync with Bryan Venteicher's virtio git repo:
d04e609bdd1973cc7d2e8b38b7dcfae057b0962d
virtio_blk: Use correct temporary variable in vtblk_poll_request
Obtained from: Bryan Venteicher bryanv at daemoninthecloset dot org
| -rw-r--r-- | sys/dev/virtio/block/virtio_blk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/virtio/block/virtio_blk.c b/sys/dev/virtio/block/virtio_blk.c index 9442a6d..d05fa7a 100644 --- a/sys/dev/virtio/block/virtio_blk.c +++ b/sys/dev/virtio/block/virtio_blk.c @@ -997,6 +997,7 @@ vtblk_poll_request(struct vtblk_softc *sc, struct vtblk_request *req) { device_t dev; struct virtqueue *vq; + struct vtblk_request *r; int error; dev = sc->vtblk_dev; @@ -1011,7 +1012,8 @@ vtblk_poll_request(struct vtblk_softc *sc, struct vtblk_request *req) virtqueue_notify(vq); - req = virtqueue_poll(vq, NULL); + r = virtqueue_poll(vq, NULL); + KASSERT(r == req, ("unexpected request response")); error = vtblk_request_error(req); if (error && bootverbose) { |
