From 4ea3e63291cb01eaa3dd41e9a2a4775832d96816 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Tue, 5 Feb 2019 11:36:29 -0700 Subject: [PATCH] bdev/aio: Remove list of channels on channel group This was only temporarily required for polling. With a per-group aio ctx, it isn't needed anymore. Change-Id: Ie59b50a4700f0f99dea470f857d187ac656dd229 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/c/443467 Reviewed-by: Darek Stojaczyk Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Tested-by: SPDK CI Jenkins --- lib/bdev/aio/bdev_aio.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lib/bdev/aio/bdev_aio.c b/lib/bdev/aio/bdev_aio.c index 3efc296f9b..87eec359df 100644 --- a/lib/bdev/aio/bdev_aio.c +++ b/lib/bdev/aio/bdev_aio.c @@ -51,15 +51,11 @@ struct bdev_aio_io_channel { uint64_t io_inflight; struct bdev_aio_group_channel *group_ch; - TAILQ_ENTRY(bdev_aio_io_channel) link; }; struct bdev_aio_group_channel { struct spdk_poller *poller; - io_context_t io_ctx; - - TAILQ_HEAD(, bdev_aio_io_channel) channels; }; struct bdev_aio_task { @@ -404,8 +400,6 @@ bdev_aio_create_cb(void *io_device, void *ctx_buf) ch->group_ch = spdk_io_channel_get_ctx(spdk_get_io_channel(&aio_if)); - TAILQ_INSERT_TAIL(&ch->group_ch->channels, ch, link); - return 0; } @@ -414,7 +408,6 @@ bdev_aio_destroy_cb(void *io_device, void *ctx_buf) { struct bdev_aio_io_channel *ch = ctx_buf; - TAILQ_REMOVE(&ch->group_ch->channels, ch, link); spdk_put_io_channel(spdk_io_channel_from_ctx(ch->group_ch)); } @@ -485,8 +478,6 @@ bdev_aio_group_create_cb(void *io_device, void *ctx_buf) { struct bdev_aio_group_channel *ch = ctx_buf; - TAILQ_INIT(&ch->channels); - if (io_setup(SPDK_AIO_QUEUE_DEPTH, &ch->io_ctx) < 0) { SPDK_ERRLOG("async I/O context setup failure\n"); return -1;