Merge pull request #557 from igaw/misc-fabric-fixes

Miscellaneous fabric fixes/improvements

Author: dwsuse

meson.build

@@ -13,8 +13,8 @@ project(
     default_options: [
         'c_std=gnu99',
         'warning_level=1',
-        'buildtype=release',
-        'prefix=/usr',
+        'buildtype=debug',
+        'prefix=/usr/local',
     ]
 )
 

src/nvme/fabrics.c

@@ -114,7 +114,7 @@ const char *nvmf_treq_str(__u8 treq)
 }
 
 static const char * const eflags_strings[] = {
-	[NVMF_DISC_EFLAGS_NONE]		= "not specified",
+	[NVMF_DISC_EFLAGS_NONE]		= "none",
 	[NVMF_DISC_EFLAGS_EPCSD]	= "explicit discovery connections",
 	[NVMF_DISC_EFLAGS_DUPRETINFO]	= "duplicate discovery information",
 	[NVMF_DISC_EFLAGS_EPCSD |
@@ -561,6 +561,9 @@ static int __nvmf_add_ctrl(nvme_root_t r, const char *argstr)
 		case EOPNOTSUPP:
 			ret = -ENVME_CONNECT_OPNOTSUPP;
 			break;
+		case ECONNREFUSED :
+			ret = -ENVME_CONNECT_CONNREFUSED;
+			break;
 		default:
 			ret = -ENVME_CONNECT_WRITE;
 			break;
@@ -658,7 +661,8 @@ int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
 		return -1;
 	}
 
-	nvme_msg(h->r, LOG_INFO, "nvme%d: ctrl connected\n", ret);
+	nvme_msg(h->r, LOG_INFO, "nvme%d: %s connected\n", ret,
+		 nvme_ctrl_get_subsysnqn(c));
 	return nvme_init_ctrl(h, c, ret);
 }
 

src/nvme/ioctl.h

@@ -3752,6 +3752,7 @@ static inline int nvme_fdp_reclaim_unit_handle_status(int fd, __u32 nsid,
 		.nsid = nsid,
 		.data_len = data_len,
 		.timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
+		.mos = 0,
 		.mo = NVME_IO_MGMT_RECV_RUH_STATUS,
 	};
 

src/nvme/tree.c

@@ -931,7 +931,7 @@ int nvme_disconnect_ctrl(nvme_ctrl_t c)
 			 c->name, errno);
 		return ret;
 	}
-	nvme_msg(r, LOG_INFO, "%s: disconnected\n", c->name);
+	nvme_msg(r, LOG_INFO, "%s: %s disconnected\n", c->name, c->subsysnqn);
 	nvme_deconfigure_ctrl(c);
 	return 0;
 }

src/nvme/util.c

@@ -564,6 +564,7 @@ static const char * const libnvme_status[] = {
 	[ENVME_CONNECT_ADDRINUSE] = "hostnqn already in use",
 	[ENVME_CONNECT_NODEV] = "invalid interface",
 	[ENVME_CONNECT_OPNOTSUPP] ="not supported",
+	[ENVME_CONNECT_CONNREFUSED] = "connection refused",
 };
 
 const char *nvme_errno_to_string(int status)

src/nvme/util.h

@@ -36,6 +36,7 @@
  * @ENVME_CONNECT_ADDRINUSE:	hostnqn already in use
  * @ENVME_CONNECT_NODEV:	invalid interface
  * @ENVME_CONNECT_OPNOTSUPP:	not supported
+ * @ENVME_CONNECT_CONNREFUSED:      connection refused
  */
 enum nvme_connect_err {
 	ENVME_CONNECT_RESOLVE	= 1000,
@@ -55,6 +56,7 @@ enum nvme_connect_err {
 	ENVME_CONNECT_ADDRINUSE,
 	ENVME_CONNECT_NODEV,
 	ENVME_CONNECT_OPNOTSUPP,
+	ENVME_CONNECT_CONNREFUSED,
 };
 
 /**