From e5b7f59d9c1632f4c21eea45293fa8b0fd86ac58 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Fri, 31 May 2019 03:19:49 -0400 Subject: [PATCH] bdev: directly use spdk_bdev_io_get_io_channel() where needed The function spdk_bdev_io_get_io_channel() was added, but remained unused. Couple places done the exact same thing, so now they just use it directly. Change-Id: Ifa332ce3a489256ccf2f5d0dd9c74a3215c544ce Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456435 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- lib/bdev/bdev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 7e499f94f..4678e4a34 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -576,7 +576,7 @@ _bdev_io_set_buf(struct spdk_bdev_io *bdev_io, void *buf, uint64_t len) } bdev_io->internal.buf = buf; - bdev_io->internal.get_buf_cb(bdev_io->internal.ch->channel, bdev_io, true); + bdev_io->internal.get_buf_cb(spdk_bdev_io_get_io_channel(bdev_io), bdev_io, true); } static void @@ -674,7 +674,7 @@ spdk_bdev_io_get_buf(struct spdk_bdev_io *bdev_io, spdk_bdev_io_get_buf_cb cb, u if (_is_buf_allocated(bdev_io->u.bdev.iovs) && _are_iovs_aligned(bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, alignment)) { /* Buffer already present and aligned */ - cb(bdev_io->internal.ch->channel, bdev_io, true); + cb(spdk_bdev_io_get_io_channel(bdev_io), bdev_io, true); return; } @@ -682,7 +682,7 @@ spdk_bdev_io_get_buf(struct spdk_bdev_io *bdev_io, spdk_bdev_io_get_buf_cb cb, u SPDK_BDEV_POOL_ALIGNMENT) { SPDK_ERRLOG("Length + alignment %" PRIu64 " is larger than allowed\n", len + alignment); - cb(bdev_io->internal.ch->channel, bdev_io, false); + cb(spdk_bdev_io_get_io_channel(bdev_io), bdev_io, false); return; } @@ -3586,7 +3586,7 @@ _spdk_bdev_ch_retry_io(struct spdk_bdev_channel *bdev_ch) bdev_io->internal.ch->io_outstanding++; shared_resource->io_outstanding++; bdev_io->internal.status = SPDK_BDEV_IO_STATUS_PENDING; - bdev->fn_table->submit_request(bdev_io->internal.ch->channel, bdev_io); + bdev->fn_table->submit_request(spdk_bdev_io_get_io_channel(bdev_io), bdev_io); if (bdev_io->internal.status == SPDK_BDEV_IO_STATUS_NOMEM) { break; } @@ -3657,7 +3657,7 @@ _spdk_bdev_io_complete(void *ctx) data[2] = bdev_io->internal.ch->stat.num_write_ops - bdev_io->internal.ch->prev_stat.num_write_ops; data[3] = bdev_io->internal.ch->stat.bytes_written - bdev_io->internal.ch->prev_stat.bytes_written; data[4] = bdev_io->bdev->fn_table->get_spin_time ? - bdev_io->bdev->fn_table->get_spin_time(bdev_io->internal.ch->channel) : 0; + bdev_io->bdev->fn_table->get_spin_time(spdk_bdev_io_get_io_channel(bdev_io)) : 0; __itt_metadata_add(g_bdev_mgr.domain, __itt_null, bdev_io->internal.ch->handle, __itt_metadata_u64, 5, data);