From: Keith Busch <keith.busch@intel.com>
Date: Tue, 29 Mar 2016 19:49:47 +0000 (-0600)
Subject: Fix namespace attachment
X-Git-Tag: v0.6~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d4b3adb93bda36b44fd628a600ef6d5acbc93841;p=users%2Fsagi%2Fnvme-cli.git

Fix namespace attachment

The nsid was dropped from the command.

Signed-off-by: Keith Busch <keith.busch@intel.com>
---

diff --git a/nvme-ioctl.c b/nvme-ioctl.c
index d807a1e3..61c9375c 100644
--- a/nvme-ioctl.c
+++ b/nvme-ioctl.c
@@ -491,6 +491,7 @@ int nvme_ns_attachment(int fd, __u32 nsid, __u16 num_ctrls, __u16 *ctrlist,
 					(struct nvme_controller_list *)buf;
 	struct nvme_admin_cmd cmd = {
 		.opcode		= nvme_admin_ns_attach,
+		.nsid		= nsid,
 		.addr		= (__u64)(uintptr_t) cntlist,
 		.cdw10		= attach ? 0 : 1,
 		.data_len	= 0x1000,
diff --git a/nvme.c b/nvme.c
index add386d4..cdfc9744 100644
--- a/nvme.c
+++ b/nvme.c
@@ -539,7 +539,7 @@ static int nvme_attach_ns(int argc, char **argv, int attach, const char *desc)
 {
 	char *name = commands[attach ? ATTACH_NS : DETACH_NS].name;
 	int err, num, i, list[2048];
-	__le16 ctrlist[2048];
+	__u16 ctrlist[2048];
 
 	const char *namespace_id = "namespace to attach";
 	const char *cont = "optional comma-sep controllers list";
@@ -570,7 +570,7 @@ static int nvme_attach_ns(int argc, char **argv, int attach, const char *desc)
 	num = argconfig_parse_comma_sep_array(cfg.cntlist,
 					list, 2047);
 	for (i = 0; i < num; i++)
-		ctrlist[i] = htole16(((uint16_t)list[i]));
+		ctrlist[i] = (uint16_t)list[i];
 
 	if (attach)	
 		err = nvme_ns_attach_ctrls(fd, cfg.namespace_id, num, ctrlist);