From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnEVT-00078H-O5 for qemu-devel@nongnu.org; Sun, 01 Dec 2013 16:24:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VnEVJ-00084K-5J for qemu-devel@nongnu.org; Sun, 01 Dec 2013 16:24:47 -0500 Received: from mail-qa0-x22b.google.com ([2607:f8b0:400d:c00::22b]:48457) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnEVI-000848-Ug for qemu-devel@nongnu.org; Sun, 01 Dec 2013 16:24:37 -0500 Received: by mail-qa0-f43.google.com with SMTP id ii20so3651112qab.16 for ; Sun, 01 Dec 2013 13:24:36 -0800 (PST) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Sun, 1 Dec 2013 22:23:44 +0100 Message-Id: <1385933027-21261-12-git-send-email-marcandre.lureau@gmail.com> In-Reply-To: <1385933027-21261-1-git-send-email-marcandre.lureau@gmail.com> References: <1385933027-21261-1-git-send-email-marcandre.lureau@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCHv2 11/14] nbd: make nbd_client_session_close() idempotent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, kraxel@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- block/nbd-client.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/nbd-client.c b/block/nbd-client.c index 3dfae1d..9156093 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, -- 1.8.4.2