From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Sun, 1 Dec 2013 21:23:44 +0000 (+0100)
Subject: nbd: make nbd_client_session_close() idempotent
X-Git-Tag: v2.0.0-rc0~178^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ad283ebb82c007f49535907874213cdb05c307a;p=thirdparty%2Fqemu.git

nbd: make nbd_client_session_close() idempotent

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/block/nbd-client.c b/block/nbd-client.c
index 3dfae1da09d..9156093dc09 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -337,7 +337,12 @@ static void nbd_teardown_connection(NbdClientSession *client)
 
 void nbd_client_session_close(NbdClientSession *client)
 {
+    if (!client->bs) {
+        return;
+    }
+
     nbd_teardown_connection(client);
+    client->bs = NULL;
 }
 
 int nbd_client_session_init(NbdClientSession *client, BlockDriverState *bs,