diff --git a/include/spdk/bdev_module.h b/include/spdk/bdev_module.h index 310bc8827..d40583e28 100644 --- a/include/spdk/bdev_module.h +++ b/include/spdk/bdev_module.h @@ -1492,8 +1492,8 @@ void spdk_bdev_add_io_stat(struct spdk_bdev_io_stat *total, struct spdk_bdev_io_ void spdk_bdev_dump_io_stat_json(struct spdk_bdev_io_stat *stat, struct spdk_json_write_ctx *w); enum spdk_bdev_reset_stat_mode { - BDEV_RESET_STAT_ALL, - BDEV_RESET_STAT_MAXMIN, + SPDK_BDEV_RESET_STAT_ALL, + SPDK_BDEV_RESET_STAT_MAXMIN, }; /** diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 233ed3d65..03220c041 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -3780,7 +3780,7 @@ spdk_bdev_reset_io_stat(struct spdk_bdev_io_stat *stat, enum spdk_bdev_reset_sta stat->max_copy_latency_ticks = 0; stat->min_copy_latency_ticks = UINT64_MAX; - if (mode != BDEV_RESET_STAT_ALL) { + if (mode != SPDK_BDEV_RESET_STAT_ALL) { return; } @@ -3822,7 +3822,7 @@ bdev_alloc_io_stat(bool io_error_stat) stat->io_error = NULL; } - spdk_bdev_reset_io_stat(stat, BDEV_RESET_STAT_ALL); + spdk_bdev_reset_io_stat(stat, SPDK_BDEV_RESET_STAT_ALL); return stat; } diff --git a/lib/bdev/bdev_rpc.c b/lib/bdev/bdev_rpc.c index 361795b28..9aafc1f72 100644 --- a/lib/bdev/bdev_rpc.c +++ b/lib/bdev/bdev_rpc.c @@ -561,9 +561,9 @@ rpc_decode_reset_iostat_mode(const struct spdk_json_val *val, void *out) enum spdk_bdev_reset_stat_mode *mode = out; if (spdk_json_strequal(val, "all") == true) { - *mode = BDEV_RESET_STAT_ALL; + *mode = SPDK_BDEV_RESET_STAT_ALL; } else if (spdk_json_strequal(val, "maxmin") == true) { - *mode = BDEV_RESET_STAT_MAXMIN; + *mode = SPDK_BDEV_RESET_STAT_MAXMIN; } else { SPDK_NOTICELOG("Invalid parameter value: mode\n"); return -EINVAL; @@ -580,7 +580,7 @@ static const struct spdk_json_object_decoder rpc_bdev_reset_iostat_decoders[] = static void rpc_bdev_reset_iostat(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { - struct rpc_bdev_reset_iostat req = { .mode = BDEV_RESET_STAT_ALL, }; + struct rpc_bdev_reset_iostat req = { .mode = SPDK_BDEV_RESET_STAT_ALL, }; struct spdk_bdev_desc *desc = NULL; struct rpc_reset_iostat_ctx *rpc_ctx; struct bdev_reset_iostat_ctx *bdev_ctx; diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index ed72b63f7..7e9ae6070 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -602,7 +602,7 @@ _bdev_nvme_add_io_path(struct nvme_bdev_channel *nbdev_ch, struct nvme_ns *nvme_ SPDK_ERRLOG("Failed to alloc io_path stat.\n"); return -ENOMEM; } - spdk_bdev_reset_io_stat(io_path->stat, BDEV_RESET_STAT_MAXMIN); + spdk_bdev_reset_io_stat(io_path->stat, SPDK_BDEV_RESET_STAT_MAXMIN); } io_path->nvme_ns = nvme_ns; @@ -3674,7 +3674,7 @@ nvme_ns_alloc(void) free(nvme_ns); return NULL; } - spdk_bdev_reset_io_stat(nvme_ns->stat, BDEV_RESET_STAT_MAXMIN); + spdk_bdev_reset_io_stat(nvme_ns->stat, SPDK_BDEV_RESET_STAT_MAXMIN); } return nvme_ns;