From patchwork Mon Aug 10 06:12:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 52133 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by patches.linaro.org (Postfix) with ESMTPS id 3A09020539 for ; Mon, 10 Aug 2015 06:16:12 +0000 (UTC) Received: by lagz9 with SMTP id z9sf38378969lag.3 for ; Sun, 09 Aug 2015 23:16:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=ijocLvbAv0FI1NCuz7ShyI2nFFYujVklXCjrnAENf18=; b=F9qy11/bZRi5kCX7cn/qHKsUltVaDpxzeFWO9Dj/UyULTkASZqTGrby4FvyD9xDqOP XQok8VgzreDu5y3YDvKKblXzgAZh9CMUMA17gDF+ogDiANV4oXL24TBuzhklppos1peG dTl9lsRuUjJpd7e1xlzuZwXqQ8yJTmPa5BY7ytknmgs35SN+aZJK9pV328OVEu0zlcGT el5TUd2IeG6Zuogrmu3flCsakCEb5GKHBkLRYJiQ5UZLViGb9E8sxCCeVm6wVd95c2ou E9RWUq5SqVlTS9vqsobnmOMNoY2DMW76kN5nMEQU6ocKusliqZvQwKpUhjCjBuT4EmDr pJ+Q== X-Gm-Message-State: ALoCoQmFDoxP9KwNnhXQ/zr5lUlXF0kdCfHRYnz7ONx3Fyy12c2bfkE451MpDFDhaJ6l1Et/XpFH X-Received: by 10.112.139.137 with SMTP id qy9mr5724474lbb.17.1439187371149; Sun, 09 Aug 2015 23:16:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.167 with SMTP id g7ls654525lae.75.gmail; Sun, 09 Aug 2015 23:16:10 -0700 (PDT) X-Received: by 10.112.166.106 with SMTP id zf10mr18601629lbb.36.1439187370974; Sun, 09 Aug 2015 23:16:10 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id bn6si13413125lbc.95.2015.08.09.23.16.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Aug 2015 23:16:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lalv9 with SMTP id v9so5482480lal.0 for ; Sun, 09 Aug 2015 23:16:10 -0700 (PDT) X-Received: by 10.152.4.163 with SMTP id l3mr19005319lal.35.1439187370872; Sun, 09 Aug 2015 23:16:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp1740095lba; Sun, 9 Aug 2015 23:16:09 -0700 (PDT) X-Received: by 10.70.23.196 with SMTP id o4mr28913726pdf.1.1439187368949; Sun, 09 Aug 2015 23:16:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 7si16903460pdj.79.2015.08.09.23.16.07; Sun, 09 Aug 2015 23:16:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754172AbbHJGQF (ORCPT + 28 others); Mon, 10 Aug 2015 02:16:05 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:33244 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754093AbbHJGQC (ORCPT ); Mon, 10 Aug 2015 02:16:02 -0400 Received: by pdrh1 with SMTP id h1so49720683pdr.0 for ; Sun, 09 Aug 2015 23:16:01 -0700 (PDT) X-Received: by 10.70.37.169 with SMTP id z9mr41122682pdj.123.1439187361634; Sun, 09 Aug 2015 23:16:01 -0700 (PDT) Received: from localhost ([223.227.137.11]) by smtp.gmail.com with ESMTPSA id pj3sm3577619pdb.6.2015.08.09.23.15.58 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 09 Aug 2015 23:16:01 -0700 (PDT) From: Viresh Kumar To: akpm@linux-foundation.org Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, Viresh Kumar , "David S. Miller" , dev@openvswitch.org (open list:OPENVSWITCH), linux-sctp@vger.kernel.org (open list:SCTP PROTOCOL), Neil Horman , netdev@vger.kernel.org (open list:OPENVSWITCH), Pravin Shelar , Vlad Yasevich Subject: [PATCH V1 Resend 11/11] net: Drop unlikely before IS_ERR(_OR_NULL) Date: Mon, 10 Aug 2015 11:42:33 +0530 Message-Id: X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there is no need to do that again from its callers. Drop it. Signed-off-by: Viresh Kumar --- net/openvswitch/datapath.c | 2 +- net/sctp/socket.c | 2 +- net/socket.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index ffe984f5b95c..a515e338cade 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1143,7 +1143,7 @@ static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info) info, OVS_FLOW_CMD_NEW, false, ufid_flags); - if (unlikely(IS_ERR(reply))) { + if (IS_ERR(reply)) { error = PTR_ERR(reply); goto err_unlock_ovs; } diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 17bef01b9aa3..897c01c029ca 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4475,7 +4475,7 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval } newfile = sock_alloc_file(newsock, 0, NULL); - if (unlikely(IS_ERR(newfile))) { + if (IS_ERR(newfile)) { put_unused_fd(retval); sock_release(newsock); return PTR_ERR(newfile); diff --git a/net/socket.c b/net/socket.c index 9963a0b53a64..dd2c247c99e3 100644 --- a/net/socket.c +++ b/net/socket.c @@ -373,7 +373,7 @@ struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname) file = alloc_file(&path, FMODE_READ | FMODE_WRITE, &socket_file_ops); - if (unlikely(IS_ERR(file))) { + if (IS_ERR(file)) { /* drop dentry, keep inode */ ihold(d_inode(path.dentry)); path_put(&path); @@ -1303,7 +1303,7 @@ SYSCALL_DEFINE4(socketpair, int, family, int, type, int, protocol, } newfile1 = sock_alloc_file(sock1, flags, NULL); - if (unlikely(IS_ERR(newfile1))) { + if (IS_ERR(newfile1)) { err = PTR_ERR(newfile1); goto out_put_unused_both; } @@ -1467,7 +1467,7 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, goto out_put; } newfile = sock_alloc_file(newsock, flags, sock->sk->sk_prot_creator->name); - if (unlikely(IS_ERR(newfile))) { + if (IS_ERR(newfile)) { err = PTR_ERR(newfile); put_unused_fd(newfd); sock_release(newsock);