import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / test / app / bdev_svc / bdev_svc.c

diff --git a/ceph/src/spdk/test/app/bdev_svc/bdev_svc.c b/ceph/src/spdk/test/app/bdev_svc/bdev_svc.c
index 2db96d6b3b6259fcd33735181dfb27b098e36ed2..84580d3f6a4fcb417c408a91550348d2aa54d994 100644 (file)
--- a/ceph/src/spdk/test/app/bdev_svc/bdev_svc.c
+++ b/ceph/src/spdk/test/app/bdev_svc/bdev_svc.c
@@ -44,13 +44,14 @@ bdev_svc_usage(void)
 {
 }
 
-static void
+static int
 bdev_svc_parse_arg(int ch, char *arg)
 {
+       return 0;
 }
 
 static void
-bdev_svc_start(void *arg1, void *arg2)
+bdev_svc_start(void *arg1)
 {
        int fd;
        int shm_id = (intptr_t)arg1;
@@ -86,7 +87,6 @@ main(int argc, char **argv)
 
        opts.name = "bdev_svc";
        opts.shutdown_cb = bdev_svc_shutdown;
-       opts.max_delay_us = 1000 * 1000;
 
        if ((rc = spdk_app_parse_args(argc, argv, &opts, "", NULL,
                                      bdev_svc_parse_arg, bdev_svc_usage)) !=
@@ -104,7 +104,7 @@ main(int argc, char **argv)
                g_unaffinitize_thread = true;
        }
 
-       rc = spdk_app_start(&opts, bdev_svc_start, (void *)(intptr_t)opts.shm_id, NULL);
+       rc = spdk_app_start(&opts, bdev_svc_start, (void *)(intptr_t)opts.shm_id);
 
        spdk_app_fini();