From patchwork Wed Jun 5 21:06:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 1110765 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=metux.net 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 45K1h53sT4z9s3l for ; Thu, 6 Jun 2019 07:12:04 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E4617ACC; Wed, 5 Jun 2019 21:12:01 +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 9E07A8DC for ; Wed, 5 Jun 2019 21:12:00 +0000 (UTC) X-Greylist: delayed 00:05:07 by SQLgrey-1.7.6 Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D3AC019B for ; Wed, 5 Jun 2019 21:11:59 +0000 (UTC) Received: from orion.localdomain ([77.2.1.21]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MBlpC-1hOgQB2mxo-00CDaq; Wed, 05 Jun 2019 23:06:43 +0200 From: "Enrico Weigelt, metux IT consult" To: linux-kernel@vger.kernel.org Date: Wed, 5 Jun 2019 23:06:40 +0200 Message-Id: <1559768800-18763-1-git-send-email-info@metux.net> X-Mailer: git-send-email 1.9.1 X-Provags-ID: V03:K1:Q0dMVNlWg9Jugz820HJgEoP92ieTHn0R4pNNu/4D0178AMiTNJA 2pbG0EUsUk5rT/7rQ+Oa2DpHh7NtfbB3rFCQu3vf/+qhcltN1aaWiUQwcWBlNkDQ8sRj8oD O2l0sqEhqlDjiJgELCviecqAYisKKctWUbBdmEfGDaTZnQLVvCYgeffxGPgXGRROq0Fv/ix 6bOtupJsJY3OSHr0Jo/3A== X-UI-Out-Filterresults: notjunk:1; V03:K0:BUjkN+llyjU=:eaiavqE/EKDcN0aHl+oKb8 K/d9kwWA5GPG2myhwwbFWj+VOdkXRb/YAXNQIoqw1xGJ35mh20eAewWGvORlH+x3hgyOYpqrJ IN5kiogGb7i1blPCSnY4ud2R44fIbOMdDxuONFSYW4oyoKXQYyeyGF/NbY67Df3BUGGbo9lV6 Y30JauiVtVpnmAAI7gG7nHiUMcpRyEBplgG0/0MoTcnL7gShTI9R8YUFE/xguRMIyyy0SIkse yWHoIutF5zrWAOFZ0Hlh6mwKvo6hwP4kVejWt//1Jl4mXpUi3evx65TR0yZZrn5fUi8w0xraA sKB+liQIQaqoYmbGDUGGB5H/K6iGlSpFY0cOJGvsILTUb3MSVI1d8R9rn3YAkAp70gRzbZYIl z6B93l26KZ06403KUhcMZXdVHWVi4l7gGpm4qLi+lnhW/JtXM4sP3x8yKLbMs5nreSn4Trqr/ aR34zFCzp5ecJFxixAgo7h/CiDI71i0PBfD7lqy14FsCu8Hiqbqy0t3ZOOz3mpxsb9qO7or6l q9jq9h5S/Owex+vawTiRFA+yLGbQBnmbyDDQEWwKaaBUshkHYNdIxje4thTryBlM6lBhPZrRQ UZ6bsgR2CbdG6Y6kcwz2iItjM2y+aUKfL8JI5DUbgHKWGWoN3MZfryaYylqkkwJb6pnpvEpvQ tn9JSZOkDrqYi3J0zwCUcrnWn8ohl2yMcnm/uJcJdguVBv4FP7JTuFQDSFcFDGICCmd4y7JZA 4r5LWI5a38qljg3S3gN41dn3zdZrddt/ILDbneQYkmyy7fdZ3iNVjZVZs5Vb2pwlTk1WM4wCg XNp4Rp/TpqMnWkJ2Cv+XbqMWhlihCtIfT7pqLh63REUuR1En/cfVoOZDZIq2hvApdVsk/1g8c UykAXPMCkq7BKw9RxrgcubUrsSfkIn3gYEjwNuk8+CDqDJB1DQcz262rpefRYw X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, 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 Cc: dev@openvswitch.org, netdev@vger.kernel.org, davem@davemloft.net Subject: [ovs-dev] [PATCH] net: openvswitch: drop unneeded likely() call around IS_ERR() 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: Enrico Weigelt IS_ERR() already calls unlikely(), so this extra likely() call around the !IS_ERR() is not needed. Signed-off-by: Enrico Weigelt --- net/openvswitch/datapath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index dc9ff93..4076e08 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1347,7 +1347,7 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info) reply = ovs_flow_cmd_alloc_info((const struct sw_flow_actions __force *) flow->sf_acts, &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,