All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, fam@euphon.net, stefanha@redhat.com,
	mreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com,
	eblake@redhat.com, rvkagan@yandex-team.ru
Subject: [PATCH v2 02/10] block/nbd: BDRVNBDState: drop unused connect_err and connect_status
Date: Thu,  8 Apr 2021 17:08:19 +0300	[thread overview]
Message-ID: <20210408140827.332915-3-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210408140827.332915-1-vsementsov@virtuozzo.com>

These fields are write-only. Drop them.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 block/nbd.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/block/nbd.c b/block/nbd.c
index 64b2977dc8..b0bbde741a 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -117,8 +117,6 @@ typedef struct BDRVNBDState {
     bool wait_drained_end;
     int in_flight;
     NBDClientState state;
-    int connect_status;
-    Error *connect_err;
     bool wait_in_flight;
 
     QEMUTimer *reconnect_delay_timer;
@@ -556,7 +554,6 @@ static void nbd_co_establish_connection_cancel(BlockDriverState *bs)
 static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s)
 {
     int ret;
-    Error *local_err = NULL;
 
     if (!nbd_client_connecting(s)) {
         return;
@@ -597,14 +594,14 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s)
         s->ioc = NULL;
     }
 
-    if (nbd_co_establish_connection(s->bs, &local_err) < 0) {
+    if (nbd_co_establish_connection(s->bs, NULL) < 0) {
         ret = -ECONNREFUSED;
         goto out;
     }
 
     bdrv_dec_in_flight(s->bs);
 
-    ret = nbd_client_handshake(s->bs, &local_err);
+    ret = nbd_client_handshake(s->bs, NULL);
 
     if (s->drained) {
         s->wait_drained_end = true;
@@ -619,11 +616,6 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s)
     bdrv_inc_in_flight(s->bs);
 
 out:
-    s->connect_status = ret;
-    error_free(s->connect_err);
-    s->connect_err = NULL;
-    error_propagate(&s->connect_err, local_err);
-
     if (ret >= 0) {
         /* successfully connected */
         s->state = NBD_CLIENT_CONNECTED;
-- 
2.29.2



  parent reply	other threads:[~2021-04-08 14:15 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-08 14:08 [PATCH v2 00/10] block/nbd: move connection code to separate file Vladimir Sementsov-Ogievskiy
2021-04-08 14:08 ` [PATCH v2 01/10] block/nbd: introduce NBDConnectThread reference counter Vladimir Sementsov-Ogievskiy
2021-04-08 15:31   ` Roman Kagan
2021-04-08 14:08 ` Vladimir Sementsov-Ogievskiy [this message]
2021-04-08 15:33   ` [PATCH v2 02/10] block/nbd: BDRVNBDState: drop unused connect_err and connect_status Roman Kagan
2021-04-08 14:08 ` [PATCH v2 03/10] util/async: aio_co_enter(): do aio_co_schedule in general case Vladimir Sementsov-Ogievskiy
2021-04-08 15:54   ` Roman Kagan
2021-04-09 14:38     ` Roman Kagan
2021-04-08 14:08 ` [PATCH v2 04/10] block/nbd: simplify waking of nbd_co_establish_connection() Vladimir Sementsov-Ogievskiy
2021-04-08 16:10   ` Roman Kagan
2021-04-08 14:08 ` [PATCH v2 05/10] block/nbd: drop thr->state Vladimir Sementsov-Ogievskiy
2021-04-08 16:36   ` Roman Kagan
2021-04-08 14:08 ` [PATCH v2 06/10] block/nbd: bs-independent interface for nbd_co_establish_connection() Vladimir Sementsov-Ogievskiy
2021-04-08 16:45   ` Roman Kagan
2021-04-08 14:08 ` [PATCH v2 07/10] block/nbd: make nbd_co_establish_connection_cancel() bs-independent Vladimir Sementsov-Ogievskiy
2021-04-08 16:50   ` Roman Kagan
2021-04-08 14:08 ` [PATCH v2 08/10] block/nbd: rename NBDConnectThread to NBDClientConnection Vladimir Sementsov-Ogievskiy
2021-04-08 16:54   ` Roman Kagan
2021-04-08 14:08 ` [PATCH v2 09/10] block/nbd: introduce nbd_client_connection_new() Vladimir Sementsov-Ogievskiy
2021-04-08 16:57   ` Roman Kagan
2021-04-08 14:08 ` [PATCH v2 10/10] nbd: move connection code from block/nbd to nbd/client-connection Vladimir Sementsov-Ogievskiy
2021-04-08 17:04   ` Roman Kagan
2021-04-08 17:07     ` Vladimir Sementsov-Ogievskiy
2021-06-02 21:32   ` Eric Blake
2021-04-08 17:16 ` [PATCH v2 00/10] block/nbd: move connection code to separate file Roman Kagan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210408140827.332915-3-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=eblake@redhat.com \
    --cc=fam@euphon.net \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rvkagan@yandex-team.ru \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.