nvme: move non-nvme_init_* helper functions to nvme-cli

These helper functions wrap nvme_init_* and nvme_submit_*, which makes
it hard to keep the API stable. Move them to nvme-cli, where they are
used extensively.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme/src/nvme/cmds.h

@@ -2294,13 +2294,15 @@ int nvme_ns_compare(nvme_ns_t n, void *buf, off_t offset, size_t count)
 int nvme_ns_flush(nvme_ns_t n)
 {
 	struct nvme_transport_handle *hdl;
+	struct nvme_passthru_cmd cmd;
 	int err;
 
 	err = nvme_ns_get_transport_handle(n, &hdl);
 	if (err)
 		return err;
 
-	return nvme_flush(hdl, nvme_ns_get_nsid(n));
+	nvme_init_flush(&cmd, nvme_ns_get_nsid(n));
+	return nvme_submit_io_passthru(hdl, &cmd);
 }
 
 static int nvme_strtou64(const char *str, void *res)

libnvme/src/nvme/tree.c

@@ -742,11 +742,12 @@ static void test_flush(void)
 		.opcode = nvme_cmd_flush,
 		.nsid = TEST_NSID,
 	};
-
+	struct nvme_passthru_cmd cmd;
 	int err;
 
 	set_mock_io_cmds(&mock_io_cmd, 1);
-	err = nvme_flush(test_hdl, TEST_NSID);
+	nvme_init_flush(&cmd, TEST_NSID);
+	err = nvme_submit_io_passthru(test_hdl, &cmd);
 	end_mock_cmds();
 	check(err == 0, "returned error %d", err);
 }