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

nbd: put nbd_disk_register ahead

Browse Source 
Also remove duplicated checking on nbd path

Change-Id: I3b2aec6de5134ef2404529690f7692689c198a56
Signed-off-by: Liu Xiaodong <xiaodong.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6121
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: <dongx.yi@intel.com>
This commit is contained in:
Liu Xiaodong 2021-01-27 12:46:38 -05:00 committed by Tomasz Zawadzki
parent 59d527f10f
commit 62a00973bf
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/nbd/nbd.c
View File

@ -187,6 +187,7 @@ spdk_nbd_fini(spdk_nbd_fini_cb cb_fn, void *cb_arg)
static int static int
nbd_disk_register(struct spdk_nbd_disk *nbd) nbd_disk_register(struct spdk_nbd_disk *nbd)
{ {
/* Make sure nbd_path is not used in this SPDK app */
if (nbd_disk_find_by_nbd_path(nbd->nbd_path)) { if (nbd_disk_find_by_nbd_path(nbd->nbd_path)) {
SPDK_NOTICELOG("%s is already exported\n", nbd->nbd_path); SPDK_NOTICELOG("%s is already exported\n", nbd->nbd_path);
return -EBUSY; return -EBUSY;
@ -917,14 +918,6 @@ nbd_start_complete(struct spdk_nbd_start_ctx *ctx)
pthread_t tid; pthread_t tid;
int flag; int flag;
/* Add nbd_disk to the end of disk list */
rc = nbd_disk_register(ctx->nbd);
if (rc != 0) {
SPDK_ERRLOG("Failed to register %s, it should not happen.\n", ctx->nbd->nbd_path);
assert(false);
goto err;
}
rc = ioctl(ctx->nbd->dev_fd, NBD_SET_BLKSIZE, spdk_bdev_get_block_size(ctx->nbd->bdev)); rc = ioctl(ctx->nbd->dev_fd, NBD_SET_BLKSIZE, spdk_bdev_get_block_size(ctx->nbd->bdev));
if (rc == -1) { if (rc == -1) {
SPDK_ERRLOG("ioctl(NBD_SET_BLKSIZE) failed: %s\n", spdk_strerror(errno)); SPDK_ERRLOG("ioctl(NBD_SET_BLKSIZE) failed: %s\n", spdk_strerror(errno));
@ -1117,10 +1110,9 @@ spdk_nbd_start(const char *bdev_name, const char *nbd_path,
TAILQ_INIT(&nbd->received_io_list); TAILQ_INIT(&nbd->received_io_list);
TAILQ_INIT(&nbd->executed_io_list); TAILQ_INIT(&nbd->executed_io_list);
/* Make sure nbd_path is not used in this SPDK app */ /* Add nbd_disk to the end of disk list */
if (nbd_disk_find_by_nbd_path(nbd->nbd_path)) { nbd_disk_register(ctx->nbd);
SPDK_NOTICELOG("%s is already exported\n", nbd->nbd_path); if (rc != 0) {
rc = -EBUSY;
goto err; goto err;
} }