On 09/20/2017 07:45 AM, Vladimir Sementsov-Ogievskiy wrote: > If we are woken up from while() loop in nbd_read_reply_entry > handles must be equal. If we are woken up from > nbd_recv_coroutines_wake_all s->quit must be true, so we do > not need checking handles equality. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> > --- > block/nbd-client.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-)
Reviewed-by: Eric Blake <ebl...@redhat.com>
>
> diff --git a/block/nbd-client.c b/block/nbd-client.c
> index acd8e5d007..486bfff9f7 100644
> --- a/block/nbd-client.c
> +++ b/block/nbd-client.c
> @@ -189,9 +189,10 @@ static int nbd_co_receive_reply(NBDClientSession *s,
> s->requests[i].receiving = true;
> qemu_coroutine_yield();
> s->requests[i].receiving = false;
> - if (s->reply.handle != request->handle || !s->ioc || s->quit) {
> + if (!s->ioc || s->quit) {
> ret = -EIO;
> } else {
> + assert(s->reply.handle == request->handle);
> ret = -s->reply.error;
> if (qiov && s->reply.error == 0) {
> assert(request->len == iov_size(qiov->iov, qiov->niov));
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
