From 534512e821c7aad66b7ac085a982c6a29eff6d31 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Wed, 22 Nov 2017 04:01:14 -0500 Subject: [PATCH] bdev/lvol: correct messages displayed on screen during tasting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During tasting, if bdev is already claimed, we send errors on screen. This is expected behavior so we should send only debug logs. Signed-off-by: Maciej Szwed Change-Id: Ic5766cfa3aed88099415991998381de69ee8b8b6 Reviewed-on: https://review.gerrithub.io/384229 Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Piotr Pelpliński Reviewed-by: Tomasz Zawadzki Reviewed-by: Daniel Verkamp Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.gerrithub.io/388565 Reviewed-by: Jim Harris --- lib/bdev/bdev.c | 3 ++- lib/bdev/lvol/vbdev_lvol.c | 2 +- lib/blob/bdev/blob_bdev.c | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 6c72787d2..469be5a53 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -1862,13 +1862,14 @@ spdk_bdev_open(struct spdk_bdev *bdev, bool write, spdk_bdev_remove_cb_t remove_ desc = calloc(1, sizeof(*desc)); if (desc == NULL) { + SPDK_ERRLOG("Failed to allocate memory for bdev descriptor\n"); return -ENOMEM; } pthread_mutex_lock(&bdev->mutex); if (write && bdev->claim_module) { - SPDK_ERRLOG("failed, %s already claimed\n", bdev->name); + SPDK_INFOLOG(SPDK_TRACE_BDEV, "Could not open %s - already claimed\n", bdev->name); free(desc); pthread_mutex_unlock(&bdev->mutex); return -EPERM; diff --git a/lib/bdev/lvol/vbdev_lvol.c b/lib/bdev/lvol/vbdev_lvol.c index 70db0b76b..fe1284e53 100644 --- a/lib/bdev/lvol/vbdev_lvol.c +++ b/lib/bdev/lvol/vbdev_lvol.c @@ -877,7 +877,7 @@ vbdev_lvs_examine(struct spdk_bdev *bdev) bs_dev = spdk_bdev_create_bs_dev(bdev, vbdev_lvs_hotremove_cb, bdev); if (!bs_dev) { - SPDK_ERRLOG("Cannot create bs dev\n"); + SPDK_INFOLOG(SPDK_TRACE_VBDEV_LVOL, "Cannot create bs dev on %s\n", bdev->name); spdk_bdev_module_examine_done(SPDK_GET_BDEV_MODULE(lvol)); free(req); return; diff --git a/lib/blob/bdev/blob_bdev.c b/lib/blob/bdev/blob_bdev.c index 005447d55..6d1c4ef89 100644 --- a/lib/blob/bdev/blob_bdev.c +++ b/lib/blob/bdev/blob_bdev.c @@ -210,7 +210,6 @@ spdk_bdev_create_bs_dev(struct spdk_bdev *bdev, spdk_bdev_remove_cb_t remove_cb, rc = spdk_bdev_open(bdev, true, remove_cb, remove_ctx, &desc); if (rc != 0) { - SPDK_ERRLOG("could not open bdev, error=%d\n", rc); free(b); return NULL; }