D46024.id141082.diff
No OneTemporary
Actions

Size

844 B

Referenced Files

None

Subscribers

None

D46024.id141082.diff
View Options

	diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c
	--- a/sys/dev/nvme/nvme_qpair.c
	+++ b/sys/dev/nvme/nvme_qpair.c
	@@ -682,7 +682,7 @@
	bool
	nvme_qpair_process_completions(struct nvme_qpair *qpair)
	{
	- bool done;
	+ bool done = false;

	/*
	* Interlock with reset / recovery code. This is an usually uncontended
	@@ -690,12 +690,12 @@
	* and to prevent races with the recovery process called from a timeout
	* context.
	*/
	- if (!mtx_trylock(&qpair->recovery)) {
	- qpair->num_recovery_nolock++;
	- return (false);
	- }
	+ mtx_lock(&qpair->recovery);

	- done = _nvme_qpair_process_completions(qpair);
	+ if (__predict_true(qpair->recovery_state == RECOVERY_NONE))
	+ done = _nvme_qpair_process_completions(qpair);
	+ else
	+ qpair->num_recovery_nolock++; // XXX likely need to rename

	mtx_unlock(&qpair->recovery);