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

bdev/aio: return void from bdev_aio_readv/writev 



The values returned weren't actually used, and instead
make the code unclear especially in the error cases.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Iee2661545a6831f6151a183d4ac723c835e84d13
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9349


Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 30964540

module/bdev/aio/bdev_aio.c

+8 −10
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ bdev_aio_close(struct file_disk *disk) 
	return 0;

}



static int64_t

static void

bdev_aio_readv(struct file_disk *fdisk, struct spdk_io_channel *ch,

	       struct bdev_aio_task *aio_task,

	       struct iovec *iov, int iovcnt, uint64_t nbytes, uint64_t offset)
@@ -186,20 +186,19 @@ bdev_aio_readv(struct file_disk *fdisk, struct spdk_io_channel *ch, 
		      iovcnt, nbytes, offset);



	rc = io_submit(aio_ch->io_ctx, 1, &iocb);

	if (rc < 0) {

	if (spdk_unlikely(rc < 0)) {

		if (rc == -EAGAIN) {

			spdk_bdev_io_complete(spdk_bdev_io_from_ctx(aio_task), SPDK_BDEV_IO_STATUS_NOMEM);

		} else {

			spdk_bdev_io_complete_aio_status(spdk_bdev_io_from_ctx(aio_task), rc);

			SPDK_ERRLOG("%s: io_submit returned %d\n", __func__, rc);

		}

		return -1;

	}

	} else {

		aio_ch->io_inflight++;

	return nbytes;

	}

}



static int64_t

static void

bdev_aio_writev(struct file_disk *fdisk, struct spdk_io_channel *ch,

		struct bdev_aio_task *aio_task,

		struct iovec *iov, int iovcnt, size_t len, uint64_t offset)
@@ -220,17 +219,16 @@ bdev_aio_writev(struct file_disk *fdisk, struct spdk_io_channel *ch, 
		      iovcnt, len, offset);



	rc = io_submit(aio_ch->io_ctx, 1, &iocb);

	if (rc < 0) {

	if (spdk_unlikely(rc < 0)) {

		if (rc == -EAGAIN) {

			spdk_bdev_io_complete(spdk_bdev_io_from_ctx(aio_task), SPDK_BDEV_IO_STATUS_NOMEM);

		} else {

			spdk_bdev_io_complete_aio_status(spdk_bdev_io_from_ctx(aio_task), rc);

			SPDK_ERRLOG("%s: io_submit returned %d\n", __func__, rc);

		}

		return -1;

	}

	} else {

		aio_ch->io_inflight++;

	return len;

	}

}



static void