Commit c758dc08 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Changpeng Liu
Browse files

nvmf: Reject bdev with separate metadata to attach to subsystem 



NVMe bdev module support separate metadata now but NVMf subsystem
cannot process bdev with separate metadata yet.

Hence reject any bdev with separate metadata to be attached
explicitly by this patch.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I793c6c5f61deb766d7bf427ff67ccc57a48974cf
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/457167


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent a47e7de3

lib/nvmf/subsystem.c

+5 −0
Original line number Diff line number Diff line
@@ -1022,6 +1022,11 @@ spdk_nvmf_subsystem_add_ns(struct spdk_nvmf_subsystem *subsystem, struct spdk_bd 
		return 0;

	}



	if (spdk_bdev_get_md_size(bdev) != 0 && !spdk_bdev_is_md_interleaved(bdev)) {

		SPDK_ERRLOG("Can't attach bdev with separate metadata.\n");

		return 0;

	}



	spdk_nvmf_ns_opts_get_defaults(&opts, sizeof(opts));

	if (user_opts) {

		memcpy(&opts, user_opts, spdk_min(sizeof(opts), opts_size));

test/unit/lib/nvmf/subsystem.c/subsystem_ut.c

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ DEFINE_STUB_V(spdk_bdev_module_release_bdev, 
DEFINE_STUB(spdk_bdev_get_block_size, uint32_t,

	    (const struct spdk_bdev *bdev), 512);



DEFINE_STUB(spdk_bdev_get_md_size, uint32_t,

	    (const struct spdk_bdev *bdev), 0);



DEFINE_STUB(spdk_bdev_is_md_interleaved, bool,

	    (const struct spdk_bdev *bdev), false);



DEFINE_STUB(spdk_nvmf_transport_stop_listen,

	    int,

	    (struct spdk_nvmf_transport *transport,