From 10c2d8c7ea059d32b62853df74587d1b1617361e Mon Sep 17 00:00:00 2001
From: Dmitry Savitskiy <dmitry.savitskiy@datacore.com>
Date: Fri, 5 Jul 2024 22:44:33 +0400
Subject: [PATCH] feat(spdk): updating to spdk 24.05

Signed-off-by: Dmitry Savitskiy <dmitry.savitskiy@datacore.com>
---
 build.rs                     | 1 -
 build_scripts/build_spdk.sh  | 2 +-
 nix/pkgs/libspdk/default.nix | 6 +++---
 src/bdev_builder.rs          | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.rs b/build.rs
index bfcd2de..8c8b93a 100644
--- a/build.rs
+++ b/build.rs
@@ -340,7 +340,6 @@ fn main() {
         .allowlist_var("^SPDK.*")
         .allowlist_var("^spdk.*")
         .trust_clang_mangling(false)
-        .opaque_type("^spdk_nvme_sgl_descriptor")
         .opaque_type("^spdk_nvme_ctrlr_data")
         .opaque_type("^spdk_nvme_feat_async_event_configuration.*")
         .opaque_type("^spdk_nvmf_fabric_connect.*")
diff --git a/build_scripts/build_spdk.sh b/build_scripts/build_spdk.sh
index 7299baf..679e15f 100755
--- a/build_scripts/build_spdk.sh
+++ b/build_scripts/build_spdk.sh
@@ -11,7 +11,7 @@ LOG_DIR=$(realpath "$SCRIPT_DIR/../build_logs")
 export LOG_DIR
 
 export SPDK_ROOT_DIR=${SPDK_ROOT_DIR:-""}           # Root of SPDK sources.
-export SPDK_VERSION="24.01"                         # SPDK version (currently, informative only).
+export SPDK_VERSION="24.05"                         # SPDK version (currently, informative only).
 
 export BUILD_TYPE="debug"
 export TARGET_PLATFORM="x86_64-unknown-linux-gnu"
diff --git a/nix/pkgs/libspdk/default.nix b/nix/pkgs/libspdk/default.nix
index 59726ea..c1ae6c2 100644
--- a/nix/pkgs/libspdk/default.nix
+++ b/nix/pkgs/libspdk/default.nix
@@ -85,15 +85,15 @@ let
   #
   drvAttrs = rec {
     pname = "libspdk${nameSuffix}";
-    version = "24.01-c8e02b0";
+    version = "24.05-981a969";
 
     src = [
       (fetchFromGitHub {
         name = pname;
         owner = "openebs";
         repo = "spdk";
-        rev = "c8e02b0259cc32494c305ef75c63f5a9614976b2";
-        sha256 = "sha256-/YI1NBZUqC2r2X7fdJtbeuEEnt+uaHUAsEBkHZIBppA=";
+        rev = "981a96931ce5ed5f67e0c4cdc3b0e2c0a71e2b24";
+        sha256 = "sha256-DkA2Pgcpyfss2WV+lXWFnvvcolvgu18kD5BCc+1qo64=";
         fetchSubmodules = true;
       })
       ../../../build_scripts
diff --git a/src/bdev_builder.rs b/src/bdev_builder.rs
index 1418ec1..95d91f2 100644
--- a/src/bdev_builder.rs
+++ b/src/bdev_builder.rs
@@ -210,6 +210,7 @@ where
                 max_active_zones: Default::default(),
                 optimal_open_zones: Default::default(),
                 media_events: Default::default(),
+                ctratt: unsafe { zeroed() },
                 reset_io_drain_timeout:
                     SPDK_BDEV_RESET_IO_DRAIN_RECOMMENDED_VALUE as u16,
                 module: self.module.as_ptr(),