lkml.org 
[lkml]   [2018]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the bpf-next tree with the bpf tree
On Mon, 14 May 2018 11:57:00 +1000, Stephen Rothwell wrote:
> diff --cc tools/lib/bpf/libbpf.c
> index 8da4eeb101a6,df54c4c9e48a..000000000000
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@@ -2163,9 -2193,12 +2193,12 @@@ int bpf_prog_load_xattr(const struct bp
>
> if (!attr)
> return -EINVAL;
> + if (!attr->file)
> + return -EINVAL;
>
> - obj = bpf_object__open(attr->file);
> + obj = __bpf_object__open(attr->file, NULL, 0,
> + bpf_prog_type__needs_kver(attr->prog_type));
> - if (IS_ERR(obj))
> + if (IS_ERR_OR_NULL(obj))
> return -ENOENT;

This is okay, thanks. The OR_NULL is unnecessary just using the
bpf-next code is a better merge IMO.

\
 
 \ /
  Last update: 2018-05-14 22:42    [W:0.109 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site