diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2021-09-02 13:38:01 +0300 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2021-09-29 13:46:33 -0500 |
| commit | cb116da7d722f1c5fbb32c818817aef0f576772d (patch) | |
| tree | 9a0c1bf53cd015f64d96f3318b6b9c1872a256a6 | |
| parent | f7ca4aadca865898ef9c52d75f142a9db622c712 (diff) | |
| download | focaccia-qemu-cb116da7d722f1c5fbb32c818817aef0f576772d.tar.gz focaccia-qemu-cb116da7d722f1c5fbb32c818817aef0f576772d.zip | |
block/nbd: nbd_channel_error() shutdown channel unconditionally
Don't rely on connection being totally broken in case of -EIO. Safer and more correct is to just shut down the channel anyway, since we change the state and plan on reconnecting. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20210902103805.25686-2-vsementsov@virtuozzo.com> [eblake: grammar tweaks] Signed-off-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | block/nbd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/block/nbd.c b/block/nbd.c index a66b2c282d..de59e76378 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -129,15 +129,16 @@ static bool nbd_client_connected(BDRVNBDState *s) static void nbd_channel_error(BDRVNBDState *s, int ret) { + if (nbd_client_connected(s)) { + qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); + } + if (ret == -EIO) { if (nbd_client_connected(s)) { s->state = s->reconnect_delay ? NBD_CLIENT_CONNECTING_WAIT : NBD_CLIENT_CONNECTING_NOWAIT; } } else { - if (nbd_client_connected(s)) { - qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); - } s->state = NBD_CLIENT_QUIT; } } |