Commit fc7a3701 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme: always use nvme_robust_mutex_lock for ctrlr_lock 



spdk_nvme_ctrlr_cmd_abort_ext() was calling pthread_mutex_lock()
directly. This would only cause a problem on FreeBSD, but we still
need to make it consistent.

Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23728

 (master)

(cherry picked from commit 78977629)
Change-Id: Idcc62ff6507cbdfb588a6a7de3ab3b9efa801f25
Signed-off-by: default avatarMarek Chomnicki <marek.chomnicki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23877


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 3e04ecdd

lib/nvme/nvme_ctrlr_cmd.c

+3 −3
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ spdk_nvme_ctrlr_cmd_abort_ext(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qp 
		return -EINVAL;

	}



	pthread_mutex_lock(&ctrlr->ctrlr_lock);

	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);



	if (qpair == NULL) {

		qpair = ctrlr->adminq;
@@ -762,7 +762,7 @@ spdk_nvme_ctrlr_cmd_abort_ext(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qp 


	parent = nvme_allocate_request_null(ctrlr->adminq, cb_fn, cb_arg);

	if (parent == NULL) {

		pthread_mutex_unlock(&ctrlr->ctrlr_lock);

		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);



		return -ENOMEM;

	}
@@ -842,7 +842,7 @@ spdk_nvme_ctrlr_cmd_abort_ext(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qp 
		nvme_free_request(parent);

	}



	pthread_mutex_unlock(&ctrlr->ctrlr_lock);

	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

	return rc;

}