From patchwork Wed Sep 16 17:32:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1365753 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.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.a=rsa-sha256 header.s=20161025 header.b=G4kTf2CK; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BsJy3316Tz9sVs for ; Thu, 17 Sep 2020 11:18:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9E1DB86B84; Wed, 16 Sep 2020 17:33:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nwCEsfxP_RHB; Wed, 16 Sep 2020 17:33:22 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5C51786B88; Wed, 16 Sep 2020 17:33:22 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 18055C08A8; Wed, 16 Sep 2020 17:33:22 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1424FC0051 for ; Wed, 16 Sep 2020 17:33:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E4F0A87371 for ; Wed, 16 Sep 2020 17:33:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2qUpb59vy7gm for ; Wed, 16 Sep 2020 17:33:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by hemlock.osuosl.org (Postfix) with ESMTPS id 697ED8734C for ; Wed, 16 Sep 2020 17:33:17 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id g29so4322007pgl.2 for ; Wed, 16 Sep 2020 10:33:17 -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=zxokFfbwGFrjoasyQvAf1En2ciKBcPVZnAqJXLd49XU=; b=G4kTf2CKtWSVl3XlkBekjfTIK3gVj11rSyhlqWdPLNq40/6WIwQHSnILZO1RELHIit jKBiiyNzWecwCmeOJwu96oWsE+YWrpth4kxjGn3QgioFzkcrgOzfr+4pc9UqoESPBIyE nhu+1RX7TBFz3AI16AuIs6XD3LaPFcSFaXnSoi0aRM7MzZPBejt0YayzzxLine6Pjoz7 eON0TVRQ2eWbpEvZgjYSfVCS3bqbWy0+b+9I0flT/ytkZxLwtgjQ3RLgPkQr+vFnGYlN RqgNF3p7/8T9mG9LGjl1nyDllAqjVdVECr1c4Xgbgii9Xo/uXHU/E9sAXXvk6lb+1O93 D2yQ== 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=zxokFfbwGFrjoasyQvAf1En2ciKBcPVZnAqJXLd49XU=; b=KLoQBezCy+HKuYZxYoo3g1emG0M+NRIjxR2yIPqV1C5JPCPEv/gMeVSxOj3hrxDsDE kxRkOOqTipXQskpNxwSNo4W2Xdxsz3/UxcpsWVF515QX3k38W14B/iVO4w26jbHHkTEt eujLi9M3UI+ZYBzxSPpf6svNe1GNhhYAuktRp5Cm7hkXM5Y73fFNeHOJCiVVoQIhak0X XK6NVlxd3t1k3WSLd/3GCebF9yRFQ0MVRGnujBwr7ViGGyvAVJ2nVhZNf2ktCuNqP6/p yoR/SEGYGHoiJCUc0pREzvAepl3aXothl1VRfaaBTtw9RGy8nfMT/FVCdTWT0Fy5JyuW S1bw== X-Gm-Message-State: AOAM531DseXxR2bgL4G77Clgph4r6M5HXMHrcFZgHPMM8uUJsIG1rsdz gp2ewz3njYq+P/D3OjT2d1xrLmbVBF95Ww== X-Google-Smtp-Source: ABdhPJxUPUwJhwa8/1QbIQS8nUkXBLIGD5IkDmY0lo5b8ofM7ENoNmY2nn4hUgGsR3I004DfT8AZ0Q== X-Received: by 2002:a63:5d07:: with SMTP id r7mr6524809pgb.440.1600277596739; Wed, 16 Sep 2020 10:33:16 -0700 (PDT) Received: from VMware-box.domain ([97.115.183.169]) by smtp.googlemail.com with ESMTPSA id o20sm16248519pgh.63.2020.09.16.10.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 10:33:16 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Wed, 16 Sep 2020 10:32:49 -0700 Message-Id: <20200916173311.30956-3-gvrose8192@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200916173311.30956-1-gvrose8192@gmail.com> References: <20200916173311.30956-1-gvrose8192@gmail.com> Cc: Enrico Weigelt Subject: [ovs-dev] [PATCH V3 02/24] datapath: drop unneeded likely() call around IS_ERR() X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Enrico Weigelt Upstream commit: commit b90f5aa4d6268e81dd1fd51e5ef89d2892bf040d Author: Enrico Weigelt Date: Wed Jun 5 23:06:40 2019 +0200 net: openvswitch: drop unneeded likely() call around IS_ERR() IS_ERR() already calls unlikely(), so this extra likely() call around the !IS_ERR() is not needed. Signed-off-by: Enrico Weigelt Signed-off-by: David S. Miller Cc: Enrico Weigelt Signed-off-by: Greg Rose Acked-by: Yi-Hung Wei --- datapath/datapath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapath/datapath.c b/datapath/datapath.c index d604bfd36..4c485c88a 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -1402,7 +1402,7 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info) &flow->id, info, false, ufid_flags); if (likely(reply)) { - if (likely(!IS_ERR(reply))) { + if (!IS_ERR(reply)) { rcu_read_lock(); /*To keep RCU checker happy. */ err = ovs_flow_cmd_fill_info(flow, ovs_header->dp_ifindex, reply, info->snd_portid,