From patchwork Thu Aug 20 22:49:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1348665 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.136; helo=silver.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=EhCCsv3p; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BXfyd0mHhz9sT6 for ; Fri, 21 Aug 2020 08:51:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 53E6B24E36; Thu, 20 Aug 2020 22:51:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xe7lli2jc3uJ; Thu, 20 Aug 2020 22:51:08 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id C3EBD23042; Thu, 20 Aug 2020 22:50:21 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id AFB9EC08A9; Thu, 20 Aug 2020 22:50:21 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9926CC0051 for ; Thu, 20 Aug 2020 22:50:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5E3FF22FC6 for ; Thu, 20 Aug 2020 22:50:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EThTm2N+y76V for ; Thu, 20 Aug 2020 22:50:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by silver.osuosl.org (Postfix) with ESMTPS id A208822CC6 for ; Thu, 20 Aug 2020 22:50:06 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id m71so105222pfd.1 for ; Thu, 20 Aug 2020 15:50:06 -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=e69d8OwbLhO9LDXDRTR2xk5C+/y1/bwUCXNLltuw45E=; b=EhCCsv3piTbxeOlVtqK1ZaSi2h4GBSwCirhd0itpdXkhjV9UPxVnjNWtiFJXH29Dwb s50FctkSuxzNMJFlWGaXsudIHJcKQnyiIXXEKuUpETtJTPTOGWDK/pC1a/owVd0od+GX Lczw/AjuQsBn/Z7wCNfqe8qR6ivKKyu9R6dkQvBuOZAiwtG5myzCynU/hJvvYopCffMf VaxbcrXfeg6/ltjoVnbesfDXS0p8MHysntHdJ2Zz2/RKMgxzSXucP5O0bwI/ofU3KydU 4Si+QA0EXsYf6DHS1C9U4qY1m8TalnQv1Yq0jXnUE7JABJuPyEkVjBNiy0YXD6A/WFRk nc/A== 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=e69d8OwbLhO9LDXDRTR2xk5C+/y1/bwUCXNLltuw45E=; b=ZajiKmZ9mpTkBVhID/enDUAnQjSTlJDTqgBKdUaqO9rWo13RVDfUcmLrLKTtCDXvKC HZgjSuoeJiAEnAV39nAtlvJL7E44aSSAm5HxkS6GTsySn+DWOzr5jRN+C0M2o5VrCb3y LmcntENJnH5XYvEdeFw7pctCZUEX+pF8S2on/WzM6R4VrVI3FDM2ybyKI7R4b5o248Hf NxrU12QA4p3hXpHb8tgM0lh5FYAvORmF6s7iS4+j9V9oEND2LQLMMsGsuyZyz33Dm9t0 2JybeQB/DLLQdgffYeUTClxP2ZjHiIziTH67vJd6hzw7Bvt2yA6BTSriJOcfNqmyf5a3 bKRg== X-Gm-Message-State: AOAM533YYLYdtV6e1X5B0LtfPYQakgigUWPjcHucF8sw6tBiNzXltyZN bgHpRmzIGTDWvEYKl+qR+J6mPZw8CuAPpQ== X-Google-Smtp-Source: ABdhPJz2VAW0m86i8Ga4QCgQSxJVKR02+DUnH9b/sLDjDSZpscbe0uhAPFN3p++PjCJtnrJQyP9zSA== X-Received: by 2002:a65:67c8:: with SMTP id b8mr248596pgs.206.1597963805226; Thu, 20 Aug 2020 15:50:05 -0700 (PDT) Received: from gizo.domain (97-115-99-106.ptld.qwest.net. [97.115.99.106]) by smtp.gmail.com with ESMTPSA id y6sm116866pfr.61.2020.08.20.15.50.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Aug 2020 15:50:04 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Thu, 20 Aug 2020 15:49:30 -0700 Message-Id: <1597963790-12362-4-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1597963790-12362-1-git-send-email-gvrose8192@gmail.com> References: <1597963790-12362-1-git-send-email-gvrose8192@gmail.com> Cc: Enrico Weigelt Subject: [ovs-dev] [PATCH 03/23] 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 --- datapath/datapath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapath/datapath.c b/datapath/datapath.c index d604bfd..4c485c8 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,