Commit dc9f61a3 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

nvmf: change type of discover_filter to uint32_t 



We treat it as a bitmask of multiple discovery filter rules rather than
a value describing a single filter.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Ibea52a87b89548702b100433499324e4346e0522
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22906


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Community-CI: Mellanox Build Bot
parent 3dfd91cb

include/spdk/nvmf.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct spdk_nvmf_target_opts { 
	char		name[NVMF_TGT_NAME_MAX_LENGTH];

	uint32_t	max_subsystems;

	uint16_t	crdt[3];

	enum spdk_nvmf_tgt_discovery_filter discovery_filter;

	uint32_t	discovery_filter;

};



struct spdk_nvmf_transport_opts {

lib/nvmf/ctrlr_discovery.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ nvmf_discovery_compare_tr_svcid(const struct spdk_nvme_transport_id *trid1, 
}



static bool

nvmf_discovery_compare_trid(const enum spdk_nvmf_tgt_discovery_filter filter,

nvmf_discovery_compare_trid(uint32_t filter,

			    const struct spdk_nvme_transport_id *trid1,

			    const struct spdk_nvme_transport_id *trid2)

{

lib/nvmf/nvmf_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct spdk_nvmf_tgt { 


	uint32_t				max_subsystems;



	enum spdk_nvmf_tgt_discovery_filter	discovery_filter;

	uint32_t				discovery_filter;



	enum spdk_nvmf_tgt_state                state;

lib/nvmf/nvmf_rpc.c

+2 −2
Original line number Diff line number Diff line
@@ -2107,8 +2107,8 @@ struct nvmf_rpc_target_ctx { 
static int

decode_discovery_filter(const struct spdk_json_val *val, void *out)

{

	enum spdk_nvmf_tgt_discovery_filter *_filter = (enum spdk_nvmf_tgt_discovery_filter *)out;

	enum spdk_nvmf_tgt_discovery_filter filter = SPDK_NVMF_TGT_DISCOVERY_MATCH_ANY;

	uint32_t *_filter = out;

	uint32_t filter = SPDK_NVMF_TGT_DISCOVERY_MATCH_ANY;

	char *tokens = spdk_json_strdup(val);

	char *tok;

	int rc = -EINVAL;

module/event/subsystems/nvmf/event_nvmf.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ struct spdk_nvmf_admin_passthru_conf { 


struct spdk_nvmf_tgt_conf {

	struct spdk_nvmf_admin_passthru_conf admin_passthru;

	enum spdk_nvmf_tgt_discovery_filter discovery_filter;

	uint32_t discovery_filter;

};



extern struct spdk_nvmf_tgt_conf g_spdk_nvmf_tgt_conf;