From f53d6c7a43a9ed8614ce2cca14c3448f7e1d53c4 Mon Sep 17 00:00:00 2001
From: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Date: Mon, 20 Nov 2017 22:13:43 +0100
Subject: [PATCH] rpc: only unlink unix domain socket if *we* have created it

We used to unlink the unix domain socket
regardless of who created it. Even we
got the "socket already exists" error
on init, we would still unlink the socket
on shutdown.

Change-Id: Ib14382d6d7e127d8f51f6544cbb063594e040879
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/388284
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 lib/rpc/rpc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/rpc/rpc.c b/lib/rpc/rpc.c
index 65f96d51d..4b4bcb13a 100644
--- a/lib/rpc/rpc.c
+++ b/lib/rpc/rpc.c
@@ -175,12 +175,12 @@ spdk_rpc_register_method(const char *method, spdk_rpc_method_handler func)
 void
 spdk_rpc_close(void)
 {
-	if (g_rpc_listen_addr_unix.sun_path[0]) {
-		/* Delete the Unix socket file */
-		unlink(g_rpc_listen_addr_unix.sun_path);
-	}
-
 	if (g_jsonrpc_server) {
+		if (g_rpc_listen_addr_unix.sun_path[0]) {
+			/* Delete the Unix socket file */
+			unlink(g_rpc_listen_addr_unix.sun_path);
+		}
+
 		spdk_jsonrpc_server_shutdown(g_jsonrpc_server);
 	}
 }