d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bdev/rbd: Refactor the parameters in bdev_rbd_init.

Browse Source 
Only passing rbd pointer is enough.

Signed-off-by: Ziye Yang <ziye.yang@intel.com>
Change-Id: I652581879c9ba228f9af0aa3f5353915a286c6c8
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7548
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ziye Yang 2021-04-22 21:36:03 +08:00 committed by Jim Harris
parent ea05f19304
commit 467148fce5
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,27 +188,27 @@ bdev_rados_context_init(const char *user_id, const char *rbd_pool_name, const ch
}
static int
bdev_rbd_init(const char *user_id, const char *rbd_pool_name, const char *const *config,
const char *rbd_name, rbd_image_info_t *info)
bdev_rbd_init(struct bdev_rbd *rbd)
{
int ret = 0;
rados_t cluster = NULL;
rados_ioctx_t io_ctx = NULL;
rbd_image_t image = NULL;
ret = bdev_rados_context_init(user_id, rbd_pool_name, config, &cluster, &io_ctx);
ret = bdev_rados_context_init(rbd->user_id, rbd->pool_name, (const char *const *)rbd->config,
&cluster, &io_ctx);
if (ret < 0) {
SPDK_ERRLOG("Failed to create rados context for user_id=%s and rbd_pool=%s\n",
user_id ? user_id : "admin (the default)", rbd_pool_name);
rbd->user_id ? rbd->user_id : "admin (the default)", rbd->pool_name);
return -1;
}
ret = rbd_open(io_ctx, rbd_name, &image, NULL);
ret = rbd_open(io_ctx, rbd->rbd_name, &image, NULL);
if (ret < 0) {
SPDK_ERRLOG("Failed to open specified rbd device\n");
goto end;
}
ret = rbd_stat(image, info, sizeof(*info));
ret = rbd_stat(image, &rbd->info, sizeof(rbd->info));
rbd_close(image);
if (ret < 0) {
SPDK_ERRLOG("Failed to stat specified rbd device\n");
@ -677,9 +677,7 @@ bdev_rbd_create(struct spdk_bdev **bdev, const char *name, const char *user_id,
return -ENOMEM;
}
ret = bdev_rbd_init(rbd->user_id, rbd->pool_name,
(const char *const *)rbd->config,
rbd_name, &rbd->info);
ret = bdev_rbd_init(rbd);
if (ret < 0) {
bdev_rbd_free(rbd);
SPDK_ERRLOG("Failed to init rbd device\n");