From 03bb015cda339e35defcee2ffe6bcb92ca89b4ae Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Wed, 15 Nov 2017 11:06:15 -0700 Subject: [PATCH] nbd: Remove extra event on shutdown nbd_start(), nbd_poll(), and nbd_stop() will all be called on the same core, so the poller unregister will complete synchronously. Change-Id: I4f83f3821102277704422ed63d4cde424324e0a4 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/387686 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu Reviewed-by: Daniel Verkamp --- test/lib/bdev/nbd/nbd.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/test/lib/bdev/nbd/nbd.c b/test/lib/bdev/nbd/nbd.c index 3b67812f9..0ba2a7c6f 100644 --- a/test/lib/bdev/nbd/nbd.c +++ b/test/lib/bdev/nbd/nbd.c @@ -49,20 +49,13 @@ static char *g_nbd_name = "/dev/nbd0"; #include "../common.c" -static void -nbd_stop(void *arg1, void *arg2) -{ - spdk_nbd_stop(g_nbd_disk); - spdk_app_stop(0); -} - static void nbd_shutdown(void) { - struct spdk_event *stop_event; + spdk_poller_unregister(&g_nbd_poller, NULL); - stop_event = spdk_event_allocate(spdk_env_get_current_core(), nbd_stop, NULL, NULL); - spdk_poller_unregister(&g_nbd_poller, stop_event); + spdk_nbd_stop(g_nbd_disk); + spdk_app_stop(0); } static void