Commit 7ad55b80 authored by Jim Harris's avatar Jim Harris Committed by Konrad Sztyber
Browse files

nvme: remove deprecated spdk_nvme_ctrlr_prepare_for_reset() 



Note that the prepare_for_reset flag in spdk_nvme_ctrlr is
still needed - it's just set now in the nvme_ctrlr_disconnect
path instead of this deprecated and now removed API.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I0a6aa1c72767eb67a84b8928a986e06cbac88240
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17936


Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 3616be85

deprecation.md

+0 −7
Original line number Diff line number Diff line
@@ -30,13 +30,6 @@ Please see: [UPDATE ON PMDK AND OUR LONG TERM SUPPORT STRATEGY](https://pmem.io/ 


VTune integration is in now deprecated and will be removed in SPDK 23.05.



### nvme



#### `nvme_ctrlr_prepare_for_reset`



Deprecated `spdk_nvme_ctrlr_prepare_for_reset` API, which will be removed in SPDK 22.01.

For PCIe transport, `spdk_nvme_ctrlr_disconnect` should be used before freeing I/O qpairs.



### nvmf



#### `spdk_nvmf_qpair_disconnect`

include/spdk/nvme.h

+0 −12
Original line number Diff line number Diff line
@@ -1095,18 +1095,6 @@ void spdk_nvme_ctrlr_set_remove_cb(struct spdk_nvme_ctrlr *ctrlr, 
 */

int spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr);



/**

 * Inform the driver that the application is preparing to reset the specified NVMe controller.

 * (Deprecated, please use spdk_nvme_ctrlr_disconnect() before freeing I/O qpairs instead.)

 *

 * This function allows the driver to make decisions knowing that a reset is about to happen.

 * For example, the pcie transport in this case could skip sending DELETE_CQ and DELETE_SQ

 * commands to the controller if an io qpair is freed after this function is called.

 *

 * \param ctrlr Opaque handle to NVMe controller.

 */

void spdk_nvme_ctrlr_prepare_for_reset(struct spdk_nvme_ctrlr *ctrlr);



/**

 * Disconnect the given NVMe controller.

 *

lib/nvme/nvme_ctrlr.c

+0 −13
Original line number Diff line number Diff line
@@ -1838,19 +1838,6 @@ spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr) 
	return rc;

}



SPDK_LOG_DEPRECATION_REGISTER(nvme_ctrlr_prepare_for_reset,

			      "spdk_nvme_ctrlr_prepare_for_reset() is deprecated",

			      "SPDK 22.01", 0);



void

spdk_nvme_ctrlr_prepare_for_reset(struct spdk_nvme_ctrlr *ctrlr)

{

	SPDK_LOG_DEPRECATED(nvme_ctrlr_prepare_for_reset);

	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);

	ctrlr->prepare_for_reset = true;

	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

}



int

spdk_nvme_ctrlr_reset_subsystem(struct spdk_nvme_ctrlr *ctrlr)

{

lib/nvme/spdk_nvme.map

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
	spdk_nvme_ctrlr_set_trid;

	spdk_nvme_ctrlr_reset_subsystem;

	spdk_nvme_ctrlr_reset;

	spdk_nvme_ctrlr_prepare_for_reset;

	spdk_nvme_ctrlr_reset_async;

	spdk_nvme_ctrlr_reset_poll_async;

	spdk_nvme_ctrlr_disconnect;

test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c

+0 −2
Original line number Diff line number Diff line
@@ -229,8 +229,6 @@ DEFINE_STUB(spdk_accel_submit_crc32cv, int, (struct spdk_io_channel *ch, uint32_ 
		struct iovec *iov,

		uint32_t iov_cnt, uint32_t seed, spdk_accel_completion_cb cb_fn, void *cb_arg), 0);



DEFINE_STUB_V(spdk_nvme_ctrlr_prepare_for_reset, (struct spdk_nvme_ctrlr *ctrlr));



struct ut_nvme_req {

	uint16_t			opc;

	spdk_nvme_cmd_cb		cb_fn;