import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / app / nvmf_tgt / nvmf_main.c

diff --git a/ceph/src/spdk/app/nvmf_tgt/nvmf_main.c b/ceph/src/spdk/app/nvmf_tgt/nvmf_main.c
index b1536e4965fcebeec94ccf6e8349167b5b180d92..87e402149d6cca997744a3bcfb95c94458f8a941 100644 (file)
--- a/ceph/src/spdk/app/nvmf_tgt/nvmf_main.c
+++ b/ceph/src/spdk/app/nvmf_tgt/nvmf_main.c
@@ -41,13 +41,14 @@ nvmf_usage(void)
 {
 }
 
-static void
+static int
 nvmf_parse_arg(int ch, char *arg)
 {
+       return 0;
 }
 
 static void
-nvmf_tgt_started(void *arg1, void *arg2)
+nvmf_tgt_started(void *arg1)
 {
        if (getenv("MEMZONE_DUMP") != NULL) {
                spdk_memzone_dump(stdout);
@@ -64,7 +65,6 @@ main(int argc, char **argv)
        /* default value in opts */
        spdk_app_opts_init(&opts);
        opts.name = "nvmf";
-       opts.max_delay_us = 1000; /* 1 ms */
        if ((rc = spdk_app_parse_args(argc, argv, &opts, "", NULL,
                                      nvmf_parse_arg, nvmf_usage)) !=
            SPDK_APP_PARSE_ARGS_SUCCESS) {
@@ -72,7 +72,7 @@ main(int argc, char **argv)
        }
 
        /* Blocks until the application is exiting */
-       rc = spdk_app_start(&opts, nvmf_tgt_started, NULL, NULL);
+       rc = spdk_app_start(&opts, nvmf_tgt_started, NULL);
        spdk_app_fini();
        return rc;
 }