Merge branch 'v24.05.x' into feature-aio-multi-files

Author: sadeghsav

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## v24.05.1: (Upcoming Release)
+
 ## v24.05
 
 ### accel

include/spdk/version.h

@@ -30,12 +30,12 @@ extern "C" {
  * Patch level is incremented on maintenance branch releases and reset to 0 for each
  * new major.minor release.
  */
-#define SPDK_VERSION_PATCH	0
+#define SPDK_VERSION_PATCH	1
 
 /**
  * Version string suffix.
  */
-#define SPDK_VERSION_SUFFIX	""
+#define SPDK_VERSION_SUFFIX	"-pre"
 
 /**
  * Single numeric value representing a version number for compile-time comparisons.

lib/nvme/nvme.c

@@ -706,9 +706,9 @@ nvme_ctrlr_poll_internal(struct spdk_nvme_ctrlr *ctrlr,
 		/* Controller failed to initialize. */
 		TAILQ_REMOVE(&probe_ctx->init_ctrlrs, ctrlr, tailq);
 		SPDK_ERRLOG("Failed to initialize SSD: %s\n", ctrlr->trid.traddr);
-		nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);
+		nvme_ctrlr_lock(ctrlr);
 		nvme_ctrlr_fail(ctrlr, false);
-		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
+		nvme_ctrlr_unlock(ctrlr);
 		nvme_ctrlr_destruct(ctrlr);
 		return;
 	}

lib/nvme/nvme_auth.c

@@ -192,19 +192,19 @@ nvme_auth_get_seqnum(struct spdk_nvme_qpair *qpair)
 	uint32_t seqnum;
 	int rc;
 
-	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);
+	nvme_ctrlr_lock(ctrlr);
 	if (ctrlr->auth_seqnum == 0) {
 		rc = RAND_bytes((void *)&ctrlr->auth_seqnum, sizeof(ctrlr->auth_seqnum));
 		if (rc != 1) {
-			nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
+			nvme_ctrlr_unlock(ctrlr);
 			return 0;
 		}
 	}
 	if (++ctrlr->auth_seqnum == 0) {
 		ctrlr->auth_seqnum = 1;
 	}
 	seqnum = ctrlr->auth_seqnum;
-	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
+	nvme_ctrlr_unlock(ctrlr);
 
 	return seqnum;
 }
@@ -1231,9 +1231,9 @@ nvme_fabric_qpair_authenticate_async(struct spdk_nvme_qpair *qpair)
 	assert(qpair->poll_status == NULL);
 	qpair->poll_status = status;
 
-	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);
+	nvme_ctrlr_lock(ctrlr);
 	auth->tid = ctrlr->auth_tid++;
-	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
+	nvme_ctrlr_unlock(ctrlr);
 
 	nvme_auth_set_state(qpair, NVME_QPAIR_AUTH_STATE_NEGOTIATE);