From e90a98ed98ed04810c05ce44eb77d1829e9e6ed3 Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris@intel.com>
Date: Tue, 31 Aug 2021 23:08:20 +0000
Subject: [PATCH] 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: Jim Harris <james.r.harris@intel.com>
Change-Id: Iee2661545a6831f6151a183d4ac723c835e84d13
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9349
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 module/bdev/aio/bdev_aio.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/module/bdev/aio/bdev_aio.c b/module/bdev/aio/bdev_aio.c
index b39f5ec4d..8c8c93cb6 100644
--- a/module/bdev/aio/bdev_aio.c
+++ b/module/bdev/aio/bdev_aio.c
@@ -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++;
 	}
-	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++;
 	}
-	aio_ch->io_inflight++;
-	return len;
 }
 
 static void