Commit 96abfe63 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

bdev: simplify bdev_io_submit 



Create a local variable for the spdk_bdev_channel
pointer.  This will be used again later in this patch
series.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I71bef863c422e60294b5249bf65f62d4939d1a53

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477870


Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent e37fc5a3

lib/bdev/bdev.c

+4 −4
Original line number Diff line number Diff line
@@ -1880,6 +1880,7 @@ bdev_io_submit(struct spdk_bdev_io *bdev_io) 
{

	struct spdk_bdev *bdev = bdev_io->bdev;

	struct spdk_thread *thread = spdk_bdev_io_get_thread(bdev_io);

	struct spdk_bdev_channel *ch = bdev_io->internal.ch;



	assert(thread != NULL);

	assert(bdev_io->internal.status == SPDK_BDEV_IO_STATUS_PENDING);
@@ -1890,8 +1891,7 @@ bdev_io_submit(struct spdk_bdev_io *bdev_io) 
	 * we don't try to add it a second time.

	 */

	if (bdev_io->internal.cb != bdev_io_split_done) {

		TAILQ_INSERT_TAIL(&bdev_io->internal.ch->io_submitted, bdev_io,

				  internal.ch_link);

		TAILQ_INSERT_TAIL(&ch->io_submitted, bdev_io, internal.ch_link);

	}



	if (bdev->split_on_optimal_io_boundary && bdev_io_should_split(bdev_io)) {
@@ -1902,11 +1902,11 @@ bdev_io_submit(struct spdk_bdev_io *bdev_io) 
		return;

	}



	if (bdev_io->internal.ch->flags & BDEV_CH_QOS_ENABLED) {

	if (ch->flags & BDEV_CH_QOS_ENABLED) {

		if ((thread == bdev->internal.qos->thread) || !bdev->internal.qos->thread) {

			_bdev_io_submit(bdev_io);

		} else {

			bdev_io->internal.io_submit_ch = bdev_io->internal.ch;

			bdev_io->internal.io_submit_ch = ch;

			bdev_io->internal.ch = bdev->internal.qos->ch;

			spdk_thread_send_msg(bdev->internal.qos->thread, _bdev_io_submit, bdev_io);

		}