nvme: identify primary ctrl do not accept nsid

igaw · igaw · commit aa463fb53194 · 2024-05-03T13:50:17.000+02:00
The identify primary ctrl command do not accept the namespace argument.
Thus remove it.

While at it, also update identify secondary ctrl function to use same
argument name.

Signed-off-by: Daniel Wagner &lt;dwagner@suse.de&gt;
diff --git a/nvme-wrap.c b/nvme-wrap.c
@@ -100,17 +100,16 @@ int nvme_cli_identify_allocated_ns_list(struct nvme_dev *dev, __u32 nsid,
 	return do_admin_op(identify_allocated_ns_list, dev, nsid, list);
 }
 
-int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u32 nsid,
+int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u16 cntid,
 				   struct nvme_primary_ctrl_cap *cap)
 {
-	return do_admin_op(identify_primary_ctrl, dev, nsid, cap);
+	return do_admin_op(identify_primary_ctrl, dev, cntid, cap);
 }
 
-int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev,
-					  __u16 ctrl_id,
+int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev, __u16 cntid,
 					  struct nvme_secondary_ctrl_list *sc_list)
 {
-	return do_admin_op(identify_secondary_ctrl_list, dev, ctrl_id,
+	return do_admin_op(identify_secondary_ctrl_list, dev, cntid,
 			   sc_list);
 }
 
diff --git a/nvme-wrap.h b/nvme-wrap.h
@@ -26,10 +26,9 @@ int nvme_cli_identify_active_ns_list(struct nvme_dev *dev, __u32 nsid,
 				     struct nvme_ns_list *list);
 int nvme_cli_identify_allocated_ns_list(struct nvme_dev *dev, __u32 nsid,
 					struct nvme_ns_list *list);
-int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u32 nsid,
+int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u16 cntid,
 				   struct nvme_primary_ctrl_cap *cap);
-int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev,
-					  __u16 ctrl_id,
+int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev, __u16 cntid,
 					  struct nvme_secondary_ctrl_list *sc_list);
 int nvme_cli_ns_mgmt_delete(struct nvme_dev *dev, __u32 nsid);
 int nvme_cli_ns_mgmt_create(struct nvme_dev *dev,

Original file line number	Diff line number	Diff line change
`@@ -100,17 +100,16 @@ int nvme_cli_identify_allocated_ns_list(struct nvme_dev *dev, __u32 nsid,`
`100`	`100`	`return do_admin_op(identify_allocated_ns_list, dev, nsid, list);`
`101`	`101`	`}`
`102`	`102`
`103`		`-int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u32 nsid,`
	`103`	`+int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u16 cntid,`
`104`	`104`	`struct nvme_primary_ctrl_cap *cap)`
`105`	`105`	`{`
`106`		`- return do_admin_op(identify_primary_ctrl, dev, nsid, cap);`
	`106`	`+ return do_admin_op(identify_primary_ctrl, dev, cntid, cap);`
`107`	`107`	`}`
`108`	`108`
`109`		`-int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev,`
`110`		`- __u16 ctrl_id,`
	`109`	`+int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev, __u16 cntid,`
`111`	`110`	`struct nvme_secondary_ctrl_list *sc_list)`
`112`	`111`	`{`
`113`		`- return do_admin_op(identify_secondary_ctrl_list, dev, ctrl_id,`
	`112`	`+ return do_admin_op(identify_secondary_ctrl_list, dev, cntid,`
`114`	`113`	`sc_list);`
`115`	`114`	`}`
`116`	`115`