From patchwork Wed Apr 10 01:21:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 1083056 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="I/fQ4V/Q"; 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 44f5zD3HXKz9sSR for ; Wed, 10 Apr 2019 11:24:08 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 551B51198; Wed, 10 Apr 2019 01:22:05 +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 2747E1152 for ; Wed, 10 Apr 2019 01:21:44 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id DB4F6F4 for ; Wed, 10 Apr 2019 01:21:43 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id b3so305103plr.7 for ; Tue, 09 Apr 2019 18:21:43 -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:in-reply-to:references; bh=mP8Eu0R9aiIsGJ4hNdgQxl+UAW6G7/rtdROqrv9UtpQ=; b=I/fQ4V/QMnPXoqDOS53PoT4LWQ0CQym/2H71wAp6+9sqcwnO80c7NldlAFt3V8XsB9 NvAI5ZRSrjI4vxpPTUn9HgAkmzv0Zyr20WhgAH0WHGCoSwVj84aQgAB/Yk9DuVWceJ2u 1W+GPMZe3Ndd+R3x309nbJhnjuCEyV2cvhY0os4mp245VNL5jbsQDibM3YoZBwR1PXB0 QBTuwF7lIAY12qvHltmTltcaU3Etyuv+54BE6+v39L2K/lGTGlBEyVg6aDeuoyi3HYG+ iQ9LDoD6kbaPg1cv2r7g9Ef5M27nlP4YBoskoXRhkF6eqliEcc4mcrtXOzVTVUTySG8m Gb5Q== 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:in-reply-to :references; bh=mP8Eu0R9aiIsGJ4hNdgQxl+UAW6G7/rtdROqrv9UtpQ=; b=iKpJl0/dSfx9lAHG1joNzw5YnRkLYxEw8sqMBTLrVuDPMGH6I0EhfqZ7A3UTUObPbT uanXuGaPaLetdRRn0Ce6Dn/Oi/gQgAhV4JFu4qH1fy6URaSkUsAVQE9VTJtzH//p8bZa JkCNtnWxEUHDvnEljqlWzkIxqBzM8URaS6qQsI35dH0tzgP511xSB8iUwVkNAhQznVRx DLDiId5j6bQ0GOma75PHL5doxhr5ORFQ9yXvL8h/2vLtc05+HM4uE6qI6qeE4Oy/3aOG 6mNKgKbYxg48zAlhPgKl/BgtR33bT1pK6QUxeyje0YRoLcliOSq43kHwUb7YrE9oM0zz DpcQ== X-Gm-Message-State: APjAAAXMav3ki8l8b1dTLwShaA+kAStSekHmo7OTAWvKEH02Mv4Q5HBM 3VaXLRfAl2OTezoX4/bwqFLuKlAa X-Google-Smtp-Source: APXvYqz0101hOvNUV/d3UlYSdO4UaaJNUkplfNMgjQ0Kd+qVgkcXrP9C6ulJVqHjO0FrXrw+l3A+5g== X-Received: by 2002:a17:902:2c83:: with SMTP id n3mr39331493plb.281.1554859303268; Tue, 09 Apr 2019 18:21:43 -0700 (PDT) Received: from localhost.localdomain.localdomain ([216.113.160.71]) by smtp.gmail.com with ESMTPSA id u63sm17068802pgd.16.2019.04.09.18.21.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 18:21:42 -0700 (PDT) From: Han Zhou X-Google-Original-From: Han Zhou To: dev@openvswitch.org Date: Tue, 9 Apr 2019 18:21:21 -0700 Message-Id: <1554859282-15144-6-git-send-email-hzhou8@ebay.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1554859282-15144-1-git-send-email-hzhou8@ebay.com> References: <1554859282-15144-1-git-send-email-hzhou8@ebay.com> 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 6/7] raft.c: cmd->eid should always be non-null. 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 From: Han Zhou raft_command's eid should always be non-null in all 3 cases. Fix the comment, and also replace if condition with assert. Signed-off-by: Han Zhou --- ovsdb/raft.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ovsdb/raft.c b/ovsdb/raft.c index abcc9c0..32dcea6 100644 --- a/ovsdb/raft.c +++ b/ovsdb/raft.c @@ -112,7 +112,7 @@ struct raft_command { /* Case 1 only. */ uint64_t index; /* Index in log (0 if being relayed). */ - /* Cases 2 and 3. */ + /* Cases 1, 2 and 3. */ struct uuid eid; /* Entry ID of result. */ /* Case 2 only. */ @@ -1974,9 +1974,8 @@ raft_command_initiate(struct raft *raft, } struct raft_command *cmd = raft_command_create_incomplete(raft, index); - if (eid) { - cmd->eid = *eid; - } + ovs_assert(eid); + cmd->eid = *eid; raft_waiter_create(raft, RAFT_W_ENTRY, true)->entry.index = cmd->index;