From 0a8492f4f1a75e1332dcdf7ff056b636d7908c99 Mon Sep 17 00:00:00 2001 From: foolstrong Date: Wed, 26 Nov 2025 09:20:47 +0000 Subject: [PATCH] fix compile warning Signed-off-by: foolstrong --- 0014-fix-compile-warning.patch | 64 ++++++++++++++++++++++++++++++++++ spdk.spec | 7 ++-- 2 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 0014-fix-compile-warning.patch diff --git a/0014-fix-compile-warning.patch b/0014-fix-compile-warning.patch new file mode 100644 index 0000000..64692f7 --- /dev/null +++ b/0014-fix-compile-warning.patch @@ -0,0 +1,64 @@ +From 3c69f349d3b058729e080700ab893bc64a866439 Mon Sep 17 00:00:00 2001 +From: foolstrong +Date: Wed, 26 Nov 2025 09:17:34 +0000 +Subject: [PATCH] fix compile warning + +--- + lib/bdev/bdev.c | 9 +++++---- + lib/nvme/nvme_ns_cmd.c | 4 ++-- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c +index d4b98b0..d971573 100644 +--- a/lib/bdev/bdev.c ++++ b/lib/bdev/bdev.c +@@ -3454,7 +3454,7 @@ _bdev_io_submit(void *ctx) + struct spdk_bdev_channel *bdev_ch = bdev_io->internal.ch; + + #ifdef SPDK_CONFIG_APP_RW +- struct spdk_bdev_io_stat *stat = &bdev_ch->stat; ++ struct spdk_bdev_io_stat *stat = bdev_ch->stat; + if (bdev_ch->io_outstanding > 0) { + stat->pre_ticks = stat->cur_ticks; + stat->cur_ticks = bdev_io->internal.submit_tsc; +@@ -4114,9 +4114,6 @@ bdev_channel_create(void *io_device, void *ctx_buf) + ch->flags = 0; + ch->shared_resource = shared_resource; + +-#ifdef SPDK_CONFIG_APP_RW +- spdk_bdev_init_iostat(ch, ch->bdev, ch->channel, &ch->stat); +-#endif + TAILQ_INIT(&ch->io_submitted); + TAILQ_INIT(&ch->io_locked); + TAILQ_INIT(&ch->io_accel_exec); +@@ -4128,6 +4125,10 @@ bdev_channel_create(void *io_device, void *ctx_buf) + return -1; + } + ++#ifdef SPDK_CONFIG_APP_RW ++ spdk_bdev_init_iostat(ch, ch->bdev, ch->channel, ch->stat); ++#endif ++ + ch->stat->ticks_rate = spdk_get_ticks_hz(); + + #ifdef SPDK_CONFIG_VTUNE +diff --git a/lib/nvme/nvme_ns_cmd.c b/lib/nvme/nvme_ns_cmd.c +index 9f88b4c..1db7b65 100644 +--- a/lib/nvme/nvme_ns_cmd.c ++++ b/lib/nvme/nvme_ns_cmd.c +@@ -540,10 +540,10 @@ _nvme_ns_cmd_rw(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair, + #ifdef SPDK_CONFIG_APP_RW + if (nvme_payload_type(&req->payload) == NVME_PAYLOAD_TYPE_SGL && check_sgl) { + if (ns->ctrlr->flags & SPDK_NVME_CTRLR_SGL_SUPPORTED) { +- rc = _nvme_ns_check_hw_sgl_request(qpair, payload, payload_offset, sector_size, req); ++ *rc = _nvme_ns_check_hw_sgl_request(qpair, payload, payload_offset, sector_size, req); + } + } +- if (rc > 0) { ++ if (*rc > 0) { + req->payload.payload_type = NVME_PAYLOAD_TYPE_SGL_PRP; + payload->payload_type = NVME_PAYLOAD_TYPE_SGL_PRP; + } +-- +2.33.0 + diff --git a/spdk.spec b/spdk.spec index 7eaa979..41cf4d6 100644 --- a/spdk.spec +++ b/spdk.spec @@ -4,7 +4,7 @@ Name: spdk Version: 24.01 -Release: 11 +Release: 12 Summary: Set of libraries and utilities for high performance user-mode storage License: BSD and MIT URL: http://spdk.io @@ -22,7 +22,7 @@ Patch10: 0010-Add-CUSE-switch-for-nvme-ctrlr.patch Patch11: 0011-Adapt-for-ES3000-serial-vendor-special-opcode-in-CUS.patch Patch12: 0012-adapt-for-spdk-24.01.patch Patch13: 0013-vhost-add-vhost-interrupt-coalescing.patch - +Patch14: 0014-fix-compile-warning.patch %define package_version %{version}-%{release} @@ -203,6 +203,9 @@ mv doc/output/html/ %{install_docdir} %changelog +* Wed Nov 26 2025 wangzhiqiang - 24.01-12 +- fix compile warning + * Tue Aug 19 2025 jiaqingtong - 24.01-11 - optimize interrupt coalescing parameters -- Gitee