Commit 09ef0593 authored by Ben Walker's avatar Ben Walker Committed by Changpeng Liu
Browse files

nvmf: Leverage bdev uuid to correctly detected remove+add ns while 


paused

Change-Id: Idbf00956394f7ee7ff7e27f2627785cd7146b01f
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459605


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
parent 85e97601

lib/nvmf/nvmf.c

+12 −2
Original line number Diff line number Diff line
@@ -954,13 +954,23 @@ poll_group_update_subsystem(struct spdk_nvmf_poll_group *group, 
				return -ENOMEM;

			}

			ns_info->channel = ch;

		} else {

			/* A namespace was present before and didn't change. */

		} else if (spdk_uuid_compare(&ns_info->uuid, spdk_bdev_get_uuid(ns->bdev)) != 0) {

			/* A namespace was here before, but was replaced by a new one. */

			spdk_put_io_channel(ns_info->channel);

			memset(ns_info, 0, sizeof(*ns_info));



			ch = spdk_bdev_get_io_channel(ns->desc);

			if (ch == NULL) {

				SPDK_ERRLOG("Could not allocate I/O channel.\n");

				return -ENOMEM;

			}

			ns_info->channel = ch;

		}



		if (ns == NULL) {

			memset(ns_info, 0, sizeof(*ns_info));

		} else {

			ns_info->uuid = *spdk_bdev_get_uuid(ns->bdev);

			ns_info->crkey = ns->crkey;

			ns_info->rtype = ns->rtype;

			if (ns->holder) {

lib/nvmf/nvmf_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ struct spdk_nvmf_reservation_info { 


struct spdk_nvmf_subsystem_pg_ns_info {

	struct spdk_io_channel		*channel;

	struct spdk_uuid		uuid;

	/* current reservation key, no reservation if the value is 0 */

	uint64_t			crkey;

	/* reservation type */