Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752602AbbKZABK (ORCPT ); Wed, 25 Nov 2015 19:01:10 -0500 Received: from ozlabs.org ([103.22.144.67]:45651 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751916AbbKZABI (ORCPT ); Wed, 25 Nov 2015 19:01:08 -0500 Date: Thu, 26 Nov 2015 11:01:05 +1100 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Borkmann Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20151126110105.60ec3ddc@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1873 Lines: 74 Hi all, Today's linux-next merge of the net-next tree got a conflict in: kernel/bpf/syscall.c between commit: c9da161c6517 ("bpf: fix clearing on persistent program array maps") from the net tree and commit: f99bf205dab0 ("bpf: add show_fdinfo handler for maps") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc kernel/bpf/syscall.c index 4a8f3c1d7da6,6d1407bc1531..000000000000 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@@ -101,15 -93,34 +101,32 @@@ void bpf_map_put(struct bpf_map *map } } + #ifdef CONFIG_PROC_FS + static void bpf_map_show_fdinfo(struct seq_file *m, struct file *filp) + { + const struct bpf_map *map = filp->private_data; + + seq_printf(m, + "map_type:\t%u\n" + "key_size:\t%u\n" + "value_size:\t%u\n" + "max_entries:\t%u\n", + map->map_type, + map->key_size, + map->value_size, + map->max_entries); + } + #endif + -static int bpf_map_release(struct inode *inode, struct file *filp) +void bpf_map_put_with_uref(struct bpf_map *map) { - struct bpf_map *map = filp->private_data; - - if (map->map_type == BPF_MAP_TYPE_PROG_ARRAY) - /* prog_array stores refcnt-ed bpf_prog pointers - * release them all when user space closes prog_array_fd - */ - bpf_fd_array_map_clear(map); - + bpf_map_put_uref(map); bpf_map_put(map); +} + +static int bpf_map_release(struct inode *inode, struct file *filp) +{ + bpf_map_put_with_uref(filp->private_data); return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/