Commit 1e98efc0 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Eric Blake
Browse files

block/nbd-client: save first fatal error in nbd_iter_error 



It is ok, that fatal error hides previous not fatal, but hiding
first fatal error is a bad feature.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20180312152126.286890-5-vsementsov@virtuozzo.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent e7b1948d

block/nbd-client.c

+3 −1
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ static coroutine_fn int nbd_co_receive_one_chunk( 


typedef struct NBDReplyChunkIter {

    int ret;

    bool fatal;

    Error *err;

    bool done, only_structured;

} NBDReplyChunkIter;
@@ -490,11 +491,12 @@ static void nbd_iter_error(NBDReplyChunkIter *iter, bool fatal, 
{

    assert(ret < 0);



    if (fatal || iter->ret == 0) {

    if ((fatal && !iter->fatal) || iter->ret == 0) {

        if (iter->ret != 0) {

            error_free(iter->err);

            iter->err = NULL;

        }

        iter->fatal = fatal;

        iter->ret = ret;

        error_propagate(&iter->err, *local_err);

    } else {