diff options
| author |  David S. Miller <davem@davemloft.net>
| 2018-04-25 23:04:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2018-04-25 23:04:22 -0400 |
| commit | a9537c937c1790b62de5e2789e67c0bf439b11ea (patch) | |
| tree | f258739642417d820e1683e97966a3804f323ba9 /kernel/bpf/arraymap.c | |
| parent | Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher... (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (diff) | |
| download | linux-a9537c937c1790b62de5e2789e67c0bf439b11ea.tar.gz linux-a9537c937c1790b62de5e2789e67c0bf439b11ea.tar.bz2 linux-a9537c937c1790b62de5e2789e67c0bf439b11ea.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merging net into net-next to help the bpf folks avoid
some really ugly merge conflicts.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/arraymap.c')
| -rw-r--r-- | kernel/bpf/arraymap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 02a189339381..0fd8d8f1a398 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -526,7 +526,7 @@ static u32 prog_fd_array_sys_lookup_elem(void *ptr) } /* decrement refcnt of all bpf_progs that are stored in this map */ -void bpf_fd_array_map_clear(struct bpf_map *map) +static void bpf_fd_array_map_clear(struct bpf_map *map) { struct bpf_array *array = container_of(map, struct bpf_array, map); int i; @@ -545,6 +545,7 @@ const struct bpf_map_ops prog_array_map_ops = { .map_fd_get_ptr = prog_fd_array_get_ptr, .map_fd_put_ptr = prog_fd_array_put_ptr, .map_fd_sys_lookup_elem = prog_fd_array_sys_lookup_elem, + .map_release_uref = bpf_fd_array_map_clear, }; static struct bpf_event_entry *bpf_event_entry_gen(struct file *perf_file, |