From f1c799874279e773da2fcb97df52d37854833719 Mon Sep 17 00:00:00 2001 From: Maciej Szwed Date: Fri, 13 Oct 2017 15:32:59 +0200 Subject: [PATCH] lvol: return meaningful RPC errors Signed-off-by: Maciej Szwed Change-Id: If809fe808150498c7ad6797855fda3097e3b0c84 Reviewed-on: https://review.gerrithub.io/382470 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- lib/bdev/lvol/vbdev_lvol.c | 4 ++-- lib/bdev/lvol/vbdev_lvol_rpc.c | 1 + lib/lvol/lvol.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/bdev/lvol/vbdev_lvol.c b/lib/bdev/lvol/vbdev_lvol.c index b8c3066ab..e0697d3ec 100644 --- a/lib/bdev/lvol/vbdev_lvol.c +++ b/lib/bdev/lvol/vbdev_lvol.c @@ -558,13 +558,13 @@ vbdev_lvol_resize(char *name, size_t sz, lvol = vbdev_get_lvol_by_name(name); if (lvol == NULL) { SPDK_ERRLOG("lvol '%s' does not exist\n", name); - return -1; + return -ENODEV; } bdev = spdk_bdev_get_by_name(name); if (bdev == NULL) { SPDK_ERRLOG("bdev '%s' does not exist\n", name); - return -1; + return -ENODEV; } lvs = lvol->lvol_store; diff --git a/lib/bdev/lvol/vbdev_lvol_rpc.c b/lib/bdev/lvol/vbdev_lvol_rpc.c index 3b585dfc6..d8210b39e 100644 --- a/lib/bdev/lvol/vbdev_lvol_rpc.c +++ b/lib/bdev/lvol/vbdev_lvol_rpc.c @@ -362,6 +362,7 @@ spdk_rpc_resize_lvol_bdev(struct spdk_jsonrpc_request *request, if (req.name == NULL) { SPDK_ERRLOG("missing name param\n"); + rc = -EINVAL; goto invalid; } diff --git a/lib/lvol/lvol.c b/lib/lvol/lvol.c index 764e2f112..1aa5f36fe 100644 --- a/lib/lvol/lvol.c +++ b/lib/lvol/lvol.c @@ -342,6 +342,8 @@ _spdk_lvol_create_open_cb(void *cb_arg, struct spdk_blob *blob, int lvolerrno) lvol->name = spdk_sprintf_alloc("%s_%"PRIu64, uuid, (uint64_t)blob_id); if (!lvol->name) { spdk_bs_md_close_blob(&blob, _spdk_lvol_delete_blob_cb, lvol); + SPDK_ERRLOG("Cannot alloc memory for lvol name\n"); + lvolerrno = -ENOMEM; goto invalid; }