ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev/rbd: Remove bdev_rbd_rw and bdev_rbd_flush

Browse Source 
Purpose: To simplify the code.

Signed-off-by: Ziye Yang <ziye.yang@intel.com>
Change-Id: I1ab1ceb5367b7a47f72fe1d0d03c607e8c46cb48
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3723
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Ziye Yang 2020-08-11 20:18:44 +08:00 committed by Tomasz Zawadzki
parent 6cbbc68296
commit d4229b4dd8
1 changed files with 16 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
module/bdev/rbd/bdev_rbd.c
View File

@ -239,13 +239,15 @@ bdev_rbd_finish_aiocb(rbd_completion_t cb, void *arg)
} }
static int static int
bdev_rbd_start_aio(rbd_image_t image, struct spdk_bdev_io *bdev_io, bdev_rbd_start_aio(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io,
struct iovec *iov, int iovcnt, uint64_t offset, size_t len) struct iovec *iov, int iovcnt, uint64_t offset, size_t len)
{ {
struct bdev_rbd_io_channel *rbdio_ch = spdk_io_channel_get_ctx(ch);
int ret; int ret;
rbd_completion_t comp; rbd_completion_t comp;
struct bdev_rbd_io *rbd_io; struct bdev_rbd_io *rbd_io;
rbd_image_t image = rbdio_ch->image;
ret = rbd_aio_create_completion(bdev_io, bdev_rbd_finish_aiocb, ret = rbd_aio_create_completion(bdev_io, bdev_rbd_finish_aiocb,
&comp); &comp);
if (ret < 0) { if (ret < 0) {
@ -289,27 +291,6 @@ static struct spdk_bdev_module rbd_if = {
}; };
SPDK_BDEV_MODULE_REGISTER(rbd, &rbd_if) SPDK_BDEV_MODULE_REGISTER(rbd, &rbd_if)
static int64_t
bdev_rbd_rw(struct bdev_rbd *disk, struct spdk_io_channel *ch,
struct spdk_bdev_io *bdev_io, struct iovec *iov,
int iovcnt, size_t len, uint64_t offset)
{
struct bdev_rbd_io_channel *rbdio_ch = spdk_io_channel_get_ctx(ch);
return bdev_rbd_start_aio(rbdio_ch->image, bdev_io, iov, iovcnt, offset, len);
return 0;
}
static int64_t
bdev_rbd_flush(struct bdev_rbd *disk, struct spdk_io_channel *ch,
struct spdk_bdev_io *bdev_io, uint64_t offset, uint64_t nbytes)
{
struct bdev_rbd_io_channel *rbdio_ch = spdk_io_channel_get_ctx(ch);
return bdev_rbd_start_aio(rbdio_ch->image, bdev_io, NULL, 0, offset, nbytes);
}
static int static int
bdev_rbd_reset_timer(void *arg) bdev_rbd_reset_timer(void *arg)
{ {
@ -362,13 +343,12 @@ bdev_rbd_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io,
return; return;
} }
ret = bdev_rbd_rw(bdev_io->bdev->ctxt, ret = bdev_rbd_start_aio(ch,
ch, bdev_io,
bdev_io, bdev_io->u.bdev.iovs,
bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,
bdev_io->u.bdev.iovcnt, bdev_io->u.bdev.offset_blocks * bdev_io->bdev->blocklen,
bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen, bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen);
bdev_io->u.bdev.offset_blocks * bdev_io->bdev->blocklen);
if (ret != 0) { if (ret != 0) {
spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED); spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
@ -384,20 +364,13 @@ static int _bdev_rbd_submit_request(struct spdk_io_channel *ch, struct spdk_bdev
return 0; return 0;
case SPDK_BDEV_IO_TYPE_WRITE: case SPDK_BDEV_IO_TYPE_WRITE:
return bdev_rbd_rw((struct bdev_rbd *)bdev_io->bdev->ctxt,
ch,
bdev_io,
bdev_io->u.bdev.iovs,
bdev_io->u.bdev.iovcnt,
bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen,
bdev_io->u.bdev.offset_blocks * bdev_io->bdev->blocklen);
case SPDK_BDEV_IO_TYPE_FLUSH: case SPDK_BDEV_IO_TYPE_FLUSH:
return bdev_rbd_flush((struct bdev_rbd *)bdev_io->bdev->ctxt, return bdev_rbd_start_aio(ch,
ch, bdev_io,
bdev_io, bdev_io->u.bdev.iovs,
bdev_io->u.bdev.offset_blocks * bdev_io->bdev->blocklen, bdev_io->u.bdev.iovcnt,
bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen); bdev_io->u.bdev.offset_blocks * bdev_io->bdev->blocklen,
bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen);
case SPDK_BDEV_IO_TYPE_RESET: case SPDK_BDEV_IO_TYPE_RESET:
return bdev_rbd_reset((struct bdev_rbd *)bdev_io->bdev->ctxt, return bdev_rbd_reset((struct bdev_rbd *)bdev_io->bdev->ctxt,