Date: Mon, 16 Apr 2012 18:29:13 +0000 (UTC) From: Peter Grehan <grehan@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r234349 - head/sys/dev/virtio/block Message-ID: <201204161829.q3GITDmV045223@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: grehan Date: Mon Apr 16 18:29:12 2012 New Revision: 234349 URL: http://svn.freebsd.org/changeset/base/234349 Log: 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 Modified: head/sys/dev/virtio/block/virtio_blk.c Modified: head/sys/dev/virtio/block/virtio_blk.c ============================================================================== --- head/sys/dev/virtio/block/virtio_blk.c Mon Apr 16 18:29:07 2012 (r234348) +++ head/sys/dev/virtio/block/virtio_blk.c Mon Apr 16 18:29:12 2012 (r234349) @@ -997,6 +997,7 @@ vtblk_poll_request(struct vtblk_softc *s { 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 *s 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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204161829.q3GITDmV045223>