From d815107bd5690de4e77a2923354136dad2fd1d2d Mon Sep 17 00:00:00 2001 From: Darek Stojaczyk Date: Thu, 22 Nov 2018 09:46:40 +0100 Subject: [PATCH] nbd: fixup return codes Minor cleanup just to make sure they are consistently <= 0. Change-Id: I8427fd201e60e3f8ebbcf4929eb58ca164910623 Signed-off-by: Darek Stojaczyk Reviewed-on: https://review.gerrithub.io/434324 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- lib/nbd/nbd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/nbd/nbd.c b/lib/nbd/nbd.c index 715277073..e9f030c9d 100644 --- a/lib/nbd/nbd.c +++ b/lib/nbd/nbd.c @@ -152,7 +152,7 @@ spdk_nbd_disk_register(struct spdk_nbd_disk *nbd) { if (spdk_nbd_disk_find_by_nbd_path(nbd->nbd_path)) { SPDK_NOTICELOG("%s is already exported\n", nbd->nbd_path); - return -1; + return -EBUSY; } TAILQ_INSERT_TAIL(&g_spdk_nbd.disk_head, nbd, tailq); @@ -863,12 +863,14 @@ spdk_nbd_start_complete(struct spdk_nbd_start_ctx *ctx) rc = pthread_create(&tid, NULL, nbd_start_kernel, (void *)(intptr_t)ctx->nbd->dev_fd); if (rc != 0) { SPDK_ERRLOG("could not create thread: %s\n", spdk_strerror(rc)); + rc = -rc; goto err; } rc = pthread_detach(tid); if (rc != 0) { SPDK_ERRLOG("could not detach thread for nbd kernel: %s\n", spdk_strerror(rc)); + rc = -rc; goto err; } @@ -989,6 +991,7 @@ spdk_nbd_start(const char *bdev_name, const char *nbd_path, rc = socketpair(AF_UNIX, SOCK_STREAM, 0, sp); if (rc != 0) { SPDK_ERRLOG("socketpair failed\n"); + rc = -errno; goto err; }