[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 1/9] nbd/client-connection: nbd_co_establish_connection(): fix
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v3 1/9] nbd/client-connection: nbd_co_establish_connection(): fix non set errp |
Date: |
Mon, 6 Sep 2021 22:06:46 +0300 |
When we don't have a connection and blocking is false, we return NULL
but don't set errp. That's wrong.
We have two paths for calling nbd_co_establish_connection():
1. nbd_open() -> nbd_do_establish_connection() -> ...
but that will never set blocking=false
2. nbd_reconnect_attempt() -> nbd_co_do_establish_connection() -> ...
but that uses errp=NULL
So, we are safe with our wrong errp policy in
nbd_co_establish_connection(). Still let's fix it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
nbd/client-connection.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/nbd/client-connection.c b/nbd/client-connection.c
index 7123b1e189..695f855754 100644
--- a/nbd/client-connection.c
+++ b/nbd/client-connection.c
@@ -318,6 +318,7 @@ nbd_co_establish_connection(NBDClientConnection *conn,
NBDExportInfo *info,
}
if (!blocking) {
+ error_setg(errp, "No connection at the moment");
return NULL;
}
--
2.29.2
[PATCH v3 3/9] nbd: allow reconnect on open, with corresponding new options, Vladimir Sementsov-Ogievskiy, 2021/09/06
[PATCH v3 9/9] iotests: add nbd-reconnect-on-open test, Vladimir Sementsov-Ogievskiy, 2021/09/06