From bfd7d22df5427d099c7768a88bde3242cb576d0b Mon Sep 17 00:00:00 2001 From: "Simon A. F. Lund" Date: Tue, 27 Oct 2020 13:20:12 +0100 Subject: [PATCH] examples/nvme_fio_plugin: fix log-msgs. in report_zones() and reset_wp() In spdk_fio_report_zones(), log_err did not prefix messages with "spdk/nvme", making it hard to determine who dumped the error-message. In spdk_fio_reset_wp() log_err described the wrong function. This change fixes the above. Signed-off-by: Simon A. F. Lund Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4916 (master) (cherry picked from commit 414500c9eb25725ee1e0f9ca76c37584cdb9f084) Change-Id: I41df6d451e88942806c8b5a3cf9a0902d98cb186 Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4941 Reviewed-by: Jim Harris Reviewed-by: Simon A. F. Lund Reviewed-by: Shuhei Matsumoto Tested-by: SPDK CI Jenkins --- examples/nvme/fio_plugin/fio_plugin.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/nvme/fio_plugin/fio_plugin.c b/examples/nvme/fio_plugin/fio_plugin.c index 2a5789d51..1586537c2 100644 --- a/examples/nvme/fio_plugin/fio_plugin.c +++ b/examples/nvme/fio_plugin/fio_plugin.c @@ -1189,7 +1189,7 @@ spdk_fio_report_zones(struct thread_data *td, struct fio_file *f, uint64_t offse break; default: - log_err("%s: invalid zone-type: 0x%x\n", f->file_name, zdesc->zt); + log_err("spdk/nvme: %s: inv. zone-type: 0x%x\n", f->file_name, zdesc->zt); err = -EIO; goto exit; } @@ -1218,7 +1218,7 @@ spdk_fio_report_zones(struct thread_data *td, struct fio_file *f, uint64_t offse break; default: - log_err("%s: invalid zone-state: 0x%x\n", f->file_name, zdesc->zs); + log_err("spdk/nvme: %s: inv. zone-state: 0x%x\n", f->file_name, zdesc->zs); err = -EIO; goto exit; } @@ -1264,7 +1264,7 @@ spdk_fio_reset_wp(struct thread_data *td, struct fio_file *f, uint64_t offset, u err = spdk_nvme_zns_reset_zone(fio_qpair->ns, fio_qpair->qpair, cur / lba_nbytes, false, pcu_cb, &completed); if (err || pcu(fio_qpair->qpair, &completed) || completed < 0) { - log_err("spdk/nvme: report_zones(): err: %d, cpl: %d\n", err, completed); + log_err("spdk/nvme: zns_reset_zone(): err: %d, cpl: %d\n", err, completed); err = err ? err : -EIO; break; }