From patchwork Mon Jul 9 13:40:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin-Gabriel Serdean X-Patchwork-Id: 941286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41PRPx72Jcz9s01 for ; Mon, 9 Jul 2018 23:44:05 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 7155CDB7; Mon, 9 Jul 2018 13:41:14 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id BE9FDD9A for ; Mon, 9 Jul 2018 13:41:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id BE680E2 for ; Mon, 9 Jul 2018 13:41:11 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id F1C6F1BF21B; Mon, 9 Jul 2018 13:41:09 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:48 +0300 Message-Id: <20180709134056.7060-7-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH 06/14] datapath-windows: Cleanup IpHelper.c X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Assign variables directly instead of reassigning them after. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/IpHelper.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/datapath-windows/ovsext/IpHelper.c b/datapath-windows/ovsext/IpHelper.c index 6bbd096c5..1ec10eb3d 100644 --- a/datapath-windows/ovsext/IpHelper.c +++ b/datapath-windows/ovsext/IpHelper.c @@ -368,11 +368,10 @@ OvsGetRoute(SOCKADDR_INET *destinationAddress, LIST_FORALL_SAFE(head, link, next) { SOCKADDR_INET crtSrcAddr = { 0 }; MIB_IPFORWARD_ROW2 crtRoute = { 0 }; - POVS_IPHELPER_INSTANCE crtInstance = NULL; + POVS_IPHELPER_INSTANCE crtInstance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); WCHAR interfaceName[IF_MAX_STRING_SIZE + 1]; - crtInstance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); - ExAcquireResourceExclusiveLite(&crtInstance->lock, TRUE); result = GetBestRoute2(&crtInstance->internalRow.InterfaceLuid, 0, NULL, destinationAddress, 0, &crtRoute, @@ -385,7 +384,6 @@ OvsGetRoute(SOCKADDR_INET *destinationAddress, if (minMetric > crtRoute.Metric && (!srcIp || srcIp == crtSrcAddr.Ipv4.sin_addr.S_un.S_addr)) { - status = STATUS_SUCCESS; size_t len = 0; minMetric = crtRoute.Metric; LOCK_STATE_EX lockState; @@ -538,9 +536,8 @@ OvsUpdateIpInterfaceNotification(PMIB_IPINTERFACE_ROW ipRow) ExAcquireResourceExclusiveLite(&ovsInstanceListLock, TRUE); head = &(ovsInstanceList); LIST_FORALL_SAFE(head, link, next) { - POVS_IPHELPER_INSTANCE instance = NULL; - - instance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); + POVS_IPHELPER_INSTANCE instance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); ExAcquireResourceExclusiveLite(&instance->lock, TRUE); if (OvsCheckInstanceRow(&instance->internalRow, @@ -578,9 +575,8 @@ OvsAddIpInterfaceNotification(PMIB_IPINTERFACE_ROW ipRow) ExAcquireResourceExclusiveLite(&ovsInstanceListLock, TRUE); head = &(ovsInstanceList); LIST_FORALL_SAFE(head, link, next) { - POVS_IPHELPER_INSTANCE instance = NULL; - - instance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); + POVS_IPHELPER_INSTANCE instance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); ExAcquireResourceExclusiveLite(&instance->lock, TRUE); if (OvsCheckInstanceRow(&instance->internalRow, &ipRow->InterfaceLuid, @@ -684,9 +680,8 @@ OvsRemoveIpInterfaceNotification(PMIB_IPINTERFACE_ROW ipRow) ExAcquireResourceExclusiveLite(&ovsInstanceListLock, TRUE); head = &(ovsInstanceList); LIST_FORALL_SAFE(head, link, next) { - POVS_IPHELPER_INSTANCE instance = NULL; - - instance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); + POVS_IPHELPER_INSTANCE instance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); ExAcquireResourceExclusiveLite(&instance->lock, TRUE); if (OvsCheckInstanceRow(&instance->internalRow, &ipRow->InterfaceLuid, @@ -821,9 +816,8 @@ OvsChangeCallbackUnicastIpAddress(PVOID context, ExAcquireResourceExclusiveLite(&ovsInstanceListLock, TRUE); head = &(ovsInstanceList); LIST_FORALL_SAFE(head, link, next) { - POVS_IPHELPER_INSTANCE instance = NULL; - - instance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); + POVS_IPHELPER_INSTANCE instance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); ExAcquireResourceExclusiveLite(&instance->lock, TRUE); if (instance->isIpConfigured && @@ -860,9 +854,8 @@ OvsChangeCallbackUnicastIpAddress(PVOID context, ExAcquireResourceExclusiveLite(&ovsInstanceListLock, TRUE); head = &(ovsInstanceList); LIST_FORALL_SAFE(head, link, next) { - POVS_IPHELPER_INSTANCE instance = NULL; - - instance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); + POVS_IPHELPER_INSTANCE instance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); ExAcquireResourceExclusiveLite(&instance->lock, TRUE); if (instance->isIpConfigured && @@ -1461,8 +1454,8 @@ OvsIpHelperDeleteAllInstances() head = &ovsInstanceList; if (!IsListEmpty(head)) { LIST_FORALL_SAFE(head, link, next) { - POVS_IPHELPER_INSTANCE instance = NULL; - instance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); + POVS_IPHELPER_INSTANCE instance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); ExAcquireResourceExclusiveLite(&instance->lock, TRUE); @@ -1985,11 +1978,10 @@ ip_helper_wait: NTSTATUS OvsInitIpHelper(NDIS_HANDLE ndisFilterHandle) { - NTSTATUS status = NDIS_STATUS_SUCCESS; + NTSTATUS status = ExInitializeResourceLite(&ovsInstanceListLock); HANDLE threadHandle; UINT32 i; - status = ExInitializeResourceLite(&ovsInstanceListLock); if (status != NDIS_STATUS_SUCCESS) { return status; }