From patchwork Fri Apr 27 14:04:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 905778 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="Mj4Musw7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Xcbd111Jz9s02 for ; Sat, 28 Apr 2018 01:02:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934106AbeD0PBi (ORCPT ); Fri, 27 Apr 2018 11:01:38 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:42286 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933900AbeD0OFd (ORCPT ); Fri, 27 Apr 2018 10:05:33 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w3RE1UPE001537; Fri, 27 Apr 2018 14:05:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : mime-version : content-type; s=corp-2017-10-26; bh=TOlxH2KggPonQkpgqTnHDRjYzFbxLSCqOGH5d1dh7cI=; b=Mj4Musw7haPUCgGfxxDigo9x5Q+OpLbri9t8JeXkl/D3dsm9ML9aSI4ykrU8idudreur UghTIK7n1flmZWOpxQ0DhCvnzEZyxkKIaUF8iIQ0QmD5V+hihsInlv5/5G1vexaoIUIr Ays7ZTLUZL1EmtLRGy+SuHAL3G9IuYV+UQlHSv0b56GurEc8n1tZhYIrPYdozFK/LWho g22vb79asDZc5C/JETwA5lwK7uxHIwKhHX2/80miS2jh3mNUE/XFs31q3uD90C5UA6zg YsQRZSZl+92+E3fQp9/YwmhMSOaIRhx8NMehoky8HOChOmR2/Q3Dp1GPBNplWSTCDe0c rw== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2hfwy9ypfm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Apr 2018 14:05:09 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w3RE57d2010568 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Apr 2018 14:05:07 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w3RE57Q4018701; Fri, 27 Apr 2018 14:05:07 GMT Received: from mwanda (/197.254.35.146) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 27 Apr 2018 07:05:06 -0700 Date: Fri, 27 Apr 2018 17:04:59 +0300 From: Dan Carpenter To: Alexei Starovoitov , Martin KaFai Lau Cc: Daniel Borkmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 2/2] bpf: btf: remove a couple conditions Message-ID: <20180427140459.GB19583@mwanda> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8875 signatures=668698 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=733 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1804270135 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We know "err" is zero so we can remove these and pull the code in one indent level. Signed-off-by: Dan Carpenter Acked-by: Martin KaFai Lau --- This applies to the BPF tree (linux-next) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index e631b6fd60d3..7cb0905f37c2 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -1973,16 +1973,14 @@ static struct btf *btf_parse(void __user *btf_data, u32 btf_data_size, if (err) goto errout; - if (!err && log->level && bpf_verifier_log_full(log)) { + if (log->level && bpf_verifier_log_full(log)) { err = -ENOSPC; goto errout; } - if (!err) { - btf_verifier_env_free(env); - btf_get(btf); - return btf; - } + btf_verifier_env_free(env); + btf_get(btf); + return btf; errout: btf_verifier_env_free(env);