From patchwork Wed May 30 17:08:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 922911 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mDP8jAfT"; dkim-atps=neutral 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 40wxrZ21qfz9s1d for ; Thu, 31 May 2018 03:08:45 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B9C7410F1; Wed, 30 May 2018 17:08:42 +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 513101086 for ; Wed, 30 May 2018 17:08:41 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 08B4C473 for ; Wed, 30 May 2018 17:08:40 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id a14-v6so9346708pfi.1 for ; Wed, 30 May 2018 10:08:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/cVVjvj5jXSSLIQs1i/r7ShixrqyWY/wGwCBq7NT+bc=; b=mDP8jAfT92jkcS082AqF5jvkVUDCMEbxN6U94PgBX/YxL84NizSkNtklaSOZlR4rtb ld3+Hzugyv1hV+zFv8IIbiQqpxEZ2e2YW9hSEA9KcjDbDc9s/+J5QtaBd7i7Qfw4KjOQ vJFCFPzR7NNV8zaqQd1qHxhlTBw/FDQSJqoDF0gHe4pIrkn5sqE97u/j//zd6cXowbNJ S5ojBHieXAc+rtaur9vdapEveJPsDjZjsgfSaOOZJ82/+LwFDauMeASdxd/Pcbk7VDU8 qHsI4TtYDRHDp0PdJyrA0rItMcmFke9e23MEnp15+6BgkDtNEw9qjFq7kPUtZYBDTz0r nS4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/cVVjvj5jXSSLIQs1i/r7ShixrqyWY/wGwCBq7NT+bc=; b=TbQ8oss/iFFRXWD3ET19yjSWnoZ5BH2K4AeGAldJnXSZpTqQAUWZaTYLzXKuG7Oo0r mW1vYLoPZ+DzTnzmUKHbn4hVH8H8pf7CeTwLgVuDNmXIDVobCOMo1QDKfua2bE3nak+C BEI0x/CvHonmU6sh53AYyXrWXFf0vX/PpbDy0enKtdU4g3aRJqJTuqHAKnFuz86fAffn yIPlHP3dfRjnEsDWb3SxsGx4OZl0ByI/fzCL4Pc9C0329vgIM8eOMotdqTZH4xKqUMhr Nrurvdpn+HZyLBT05ac8R4AU2xlCx/AzSHZsukO/WpbGHojT3PrcwizewpEY1y90JryR KtRw== X-Gm-Message-State: ALKqPwdyRdw5lF4w8VzqVI0Cq3XVmH4wGMJQqC85dxEnLn1srijyHHcN gI3OvI2uV1v+lZ2rbh73VG/0/A== X-Google-Smtp-Source: ADUXVKJdMorA1L0qlH3NmrO/aOh8rQ9vkuM1JO0du7Vm//JX3RMviPj+3gS09WrY1oW0cLJ5HNSFIw== X-Received: by 2002:a65:504d:: with SMTP id k13-v6mr2935187pgo.11.1527700120248; Wed, 30 May 2018 10:08:40 -0700 (PDT) Received: from localhost.localdomain.localdomain (c-73-162-150-77.hsd1.ca.comcast.net. [73.162.150.77]) by smtp.gmail.com with ESMTPSA id d6-v6sm2047638pgc.38.2018.05.30.10.08.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 10:08:39 -0700 (PDT) From: Han Zhou X-Google-Original-From: Han Zhou To: dev@openvswitch.org Date: Wed, 30 May 2018 10:08:26 -0700 Message-Id: <1527700106-82991-1-git-send-email-hzhou8@ebay.com> X-Mailer: git-send-email 2.1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] ovsdb-idl: Remove unnecessary code in track clear. 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 In ovsdb_idl_db_track_clear(), it needs to free the deleted row. However, it unnecessary to call ovsdb_idl_row_clear_old(), because this has been called in ovsdb_idl_row_destroy(). It is also confusing because it is called only if: if (ovsdb_idl_row_is_orphan(row)) This is contradict with the check in ovsdb_idl_row_clear_old(): if (!ovsdb_idl_row_is_orphan(row)) Signed-off-by: Han Zhou --- lib/ovsdb-idl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c index c6ff78e..958f924 100644 --- a/lib/ovsdb-idl.c +++ b/lib/ovsdb-idl.c @@ -1710,7 +1710,6 @@ ovsdb_idl_db_track_clear(struct ovsdb_idl_db *db) ovs_list_remove(&row->track_node); ovs_list_init(&row->track_node); if (ovsdb_idl_row_is_orphan(row)) { - ovsdb_idl_row_clear_old(row); free(row); } }