From c193194905d3255cff259860799c657645d0a953 Mon Sep 17 00:00:00 2001 From: Christian Hopps Date: Tue, 2 May 2023 06:01:31 -0400 Subject: [PATCH] mgmtd: eliminate unused state Signed-off-by: Christian Hopps --- mgmtd/mgmt_be_adapter.c | 1 - mgmtd/mgmt_be_adapter.h | 3 --- mgmtd/mgmt_txn.c | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/mgmtd/mgmt_be_adapter.c b/mgmtd/mgmt_be_adapter.c index aedc06d246..b2cd61c0c8 100644 --- a/mgmtd/mgmt_be_adapter.c +++ b/mgmtd/mgmt_be_adapter.c @@ -316,7 +316,6 @@ static void mgmt_be_adapter_delete(struct mgmt_be_client_adapter *adapter) adapter->id = MGMTD_BE_CLIENT_ID_MAX; } - assert(adapter->refcount == 1); mgmt_be_adapter_unlock(&adapter); } diff --git a/mgmtd/mgmt_be_adapter.h b/mgmtd/mgmt_be_adapter.h index 65e5b3f6f2..e2a41ef874 100644 --- a/mgmtd/mgmt_be_adapter.h +++ b/mgmtd/mgmt_be_adapter.h @@ -63,14 +63,11 @@ struct mgmt_be_client_adapter { struct nb_config_cbs cfg_chgs; struct mgmt_be_adapters_item list_linkage; - struct mgmt_txn_badapters_item txn_list_linkage; }; #define MGMTD_BE_ADAPTER_FLAGS_CFG_SYNCED (1U << 0) DECLARE_LIST(mgmt_be_adapters, struct mgmt_be_client_adapter, list_linkage); -DECLARE_LIST(mgmt_txn_badapters, struct mgmt_be_client_adapter, - txn_list_linkage); union mgmt_be_xpath_subscr_info { uint8_t subscribed; diff --git a/mgmtd/mgmt_txn.c b/mgmtd/mgmt_txn.c index ad4a4e31f4..5046d70ab2 100644 --- a/mgmtd/mgmt_txn.c +++ b/mgmtd/mgmt_txn.c @@ -2020,7 +2020,6 @@ static struct mgmt_txn_ctx *mgmt_txn_create_new(uint64_t session_id, txn->session_id = session_id; txn->type = type; - mgmt_txn_badapters_init(&txn->be_adapters); mgmt_txns_add_tail(&mgmt_txn_mm->txn_list, txn); mgmt_txn_reqs_init(&txn->set_cfg_reqs); mgmt_txn_reqs_init(&txn->get_cfg_reqs); @@ -2461,6 +2460,7 @@ int mgmt_txn_notify_be_adapter_conn(struct mgmt_be_client_adapter *adapter, * has failed. */ FOREACH_TXN_IN_LIST (mgmt_txn_mm, txn) { + /* XXX why is this config only? */ if (txn->type == MGMTD_TXN_TYPE_CONFIG) { cmtcfg_req = txn->commit_cfg_req ? &txn->commit_cfg_req -- 2.39.5