Commit 17005b57 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvme: remove nvme_request::timeout field 



This field is write-only in the current code; the NVMe library does
not track timeouts on requests.

Change-Id: I50e53bb3c299bf16912c48be8aad3eec829154af
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 23745996

lib/nvme/nvme.c

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ nvme_allocate_request(const struct nvme_payload *payload, uint32_t payload_size, 
	memset(req, 0, offsetof(struct nvme_request, children));

	req->cb_fn = cb_fn;

	req->cb_arg = cb_arg;

	req->timeout = true;

	req->payload = *payload;

	req->payload_size = payload_size;

lib/nvme/nvme_ctrlr.c

+0 −5
Original line number Diff line number Diff line
@@ -664,11 +664,6 @@ nvme_ctrlr_construct_and_submit_aer(struct spdk_nvme_ctrlr *ctrlr, 
		return -1;

	}



	/*

	 * Disable timeout here, since asynchronous event requests should by

	 *  nature never be timed out.

	 */

	req->timeout = false;

	req->cmd.opc = SPDK_NVME_OPC_ASYNC_EVENT_REQUEST;

	nvme_ctrlr_submit_admin_request(ctrlr, req);

lib/nvme/nvme_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ struct nvme_request { 
	 */

	struct nvme_payload		payload;



	uint8_t				timeout;

	uint8_t				retries;



	/**

test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut.c

+0 −1
Original line number Diff line number Diff line
@@ -252,7 +252,6 @@ nvme_allocate_request(const struct nvme_payload *payload, uint32_t payload_size, 


		req->cb_fn = cb_fn;

		req->cb_arg = cb_arg;

		req->timeout = true;

	}



	return req;

test/lib/nvme/unit/nvme_ctrlr_cmd_c/nvme_ctrlr_cmd_ut.c

+0 −1
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ nvme_allocate_request(const struct nvme_payload *payload, uint32_t payload_size, 


	req->cb_fn = cb_fn;

	req->cb_arg = cb_arg;

	req->timeout = true;



	return req;

}