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/syscall.c | |
| parent | e9350d443584f5d72483b1ae035f4527cfac7a9a (diff) | |
| parent | 25eb0ea7174c6e84f21fa59dccbddd0318b17b12 (diff) | |
| download | linux-a9537c937c1790b62de5e2789e67c0bf439b11ea.tar.bz2 | |
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/syscall.c')
| -rw-r--r-- | kernel/bpf/syscall.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index fe23dc5a3ec4..a22c26e6d58b 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -260,8 +260,8 @@ static void bpf_map_free_deferred(struct work_struct *work) static void bpf_map_put_uref(struct bpf_map *map) { if (atomic_dec_and_test(&map->usercnt)) { - if (map->map_type == BPF_MAP_TYPE_PROG_ARRAY) - bpf_fd_array_map_clear(map); + if (map->ops->map_release_uref) + map->ops->map_release_uref(map); } } |