diff options
| author | Christian Brauner <brauner@kernel.org> | 2022-07-13 12:43:17 +0300 |
|---|---|---|
| committer | Christian Brauner (Microsoft) <brauner@kernel.org> | 2022-07-15 23:06:10 +0300 |
| commit | 45598fd4e2897306ed5006e6a80b0460c3079bbd (patch) | |
| tree | 164a07f11459c526fe311bc9998ac17c6d59aaf4 /tools/lib | |
| parent | 77940f0d96cd2ec9fe2125f74f513a7254bcdd7f (diff) | |
| parent | 4a47c6385bb4e0786826e75bd4555aba32953653 (diff) | |
| download | linux-45598fd4e2897306ed5006e6a80b0460c3079bbd.tar.xz | |
Merge tag 'ovl-fixes-5.19-rc7' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into fs.idmapped.overlay.acl
Bring in Miklos' tree which contains the temporary fix for POSIX ACLs
with overlayfs on top of idmapped layers. We will add a proper fix on
top of it and then revert the temporary fix.
Cc: Seth Forshee <sforshee@digitalocean.com>
Cc: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org>
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/perf/evsel.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/tools/lib/perf/evsel.c b/tools/lib/perf/evsel.c index c1d58673f6ef..952f3520d5c2 100644 --- a/tools/lib/perf/evsel.c +++ b/tools/lib/perf/evsel.c @@ -149,23 +149,30 @@ int perf_evsel__open(struct perf_evsel *evsel, struct perf_cpu_map *cpus, int fd, group_fd, *evsel_fd; evsel_fd = FD(evsel, idx, thread); - if (evsel_fd == NULL) - return -EINVAL; + if (evsel_fd == NULL) { + err = -EINVAL; + goto out; + } err = get_group_fd(evsel, idx, thread, &group_fd); if (err < 0) - return err; + goto out; fd = sys_perf_event_open(&evsel->attr, threads->map[thread].pid, cpu, group_fd, 0); - if (fd < 0) - return -errno; + if (fd < 0) { + err = -errno; + goto out; + } *evsel_fd = fd; } } +out: + if (err) + perf_evsel__close(evsel); return err; } |