Commit 34eea269 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

nvme: Assume poll_group_disconnect_qpair() succeeds if qpair is in connected_qpairs 



poll_group_disconnect_qpair() is used only in a single place now
and transport_poll_group_disconnect_qpair() always returns 0 for all
transport.

Let's remove unnecessary processing for return code.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I45d7f8cea2117b3ec00028df234d1eb9ecc65713
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10677


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 728e3721

lib/nvme/nvme_transport.c

+7 −10
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ int 
nvme_transport_poll_group_disconnect_qpair(struct spdk_nvme_qpair *qpair)

{

	struct spdk_nvme_transport_poll_group *tgroup;

	int rc;

	int rc __attribute__((unused));



	tgroup = qpair->poll_group;
@@ -762,16 +762,13 @@ nvme_transport_poll_group_disconnect_qpair(struct spdk_nvme_qpair *qpair) 


	if (qpair->poll_group_tailq_head == &tgroup->connected_qpairs) {

		rc = tgroup->transport->ops.poll_group_disconnect_qpair(qpair);

		if (rc == 0) {

		assert(rc == 0);



		qpair->poll_group_tailq_head = &tgroup->disconnected_qpairs;

		STAILQ_REMOVE(&tgroup->connected_qpairs, qpair, spdk_nvme_qpair, poll_group_stailq);

		STAILQ_INSERT_TAIL(&tgroup->disconnected_qpairs, qpair, poll_group_stailq);

			/* EINPROGRESS indicates that a call has already been made to this function.

			 * It just keeps us from segfaulting on a double removal/insert.

			 */

		}



		return rc == -EINPROGRESS ? 0 : rc;

		return 0;

	}



	return -EINVAL;