From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751619AbeAZCJ3 (ORCPT <rfc822;w@1wt.eu>);
        Thu, 25 Jan 2018 21:09:29 -0500
Received: from mail-pf0-f194.google.com ([209.85.192.194]:43122 "EHLO
        mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751542AbeAZCJ1 (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 25 Jan 2018 21:09:27 -0500
X-Google-Smtp-Source: AH8x225jAgB+6CsQM2VeHMWX9G+2jAmaFpw4Iu95fqn8urewvqGZNeDD6oxhQRJZv51jg3hyl9CC0A==
Date: Thu, 25 Jan 2018 18:09:24 -0800
From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: =?iso-8859-1?Q?Micka=EBl_Sala=FCn?= <mic@digikod.net>
Cc: linux-kernel@vger.kernel.org, Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        "David S . Miller" <davem@davemloft.net>, netdev@vger.kernel.org
Subject: Re: [PATCH net-next v1] bpf: Use the IS_FD_ARRAY() macro in
 map_update_elem()
Message-ID: <20180126020922.moxrg5acpu4orxbd@ast-mbp>
References: <20180125235402.30527-1-mic@digikod.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20180125235402.30527-1-mic@digikod.net>
User-Agent: NeoMutt/20170421 (1.8.2)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Jan 26, 2018 at 12:54:02AM +0100, Mickaël Salaün wrote:
> Make the code more readable.
> 
> Signed-off-by: Mickaël Salaün <mic@digikod.net>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> ---
>  kernel/bpf/syscall.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
> index 5bdb0cc84ad2..e24aa3241387 100644
> --- a/kernel/bpf/syscall.c
> +++ b/kernel/bpf/syscall.c
> @@ -709,10 +709,7 @@ static int map_update_elem(union bpf_attr *attr)
>  		err = bpf_percpu_hash_update(map, key, value, attr->flags);
>  	} else if (map->map_type == BPF_MAP_TYPE_PERCPU_ARRAY) {
>  		err = bpf_percpu_array_update(map, key, value, attr->flags);
> -	} else if (map->map_type == BPF_MAP_TYPE_PERF_EVENT_ARRAY ||
> -		   map->map_type == BPF_MAP_TYPE_PROG_ARRAY ||
> -		   map->map_type == BPF_MAP_TYPE_CGROUP_ARRAY ||
> -		   map->map_type == BPF_MAP_TYPE_ARRAY_OF_MAPS) {
> +	} else if (IS_FD_ARRAY(map)) {

Applied to bpf-next, thank you Mickael.