Skip to content

Commit 678e03f

Browse files
acmelopsiff
authored andcommitted
perf namespaces: Fixup the nsinfo__in_pidns() return type, its bool
[ Upstream commit 64a7617 ] When adding support for refconunt checking a cut'n'paste made this function, that is just an accessor to a bool member of 'struct nsinfo', return a pid_t, when that member is a boolean, fix it. Fixes: bcaf0a9 ("perf namespaces: Add functions to access nsinfo") Reported-by: Francesco Nigro <fnigro@redhat.com> Reported-by: Ilan Green <igreen@redhat.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Clark Williams <williams@redhat.com> Cc: Ian Rogers <irogers@google.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: James Clark <james.clark@linaro.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Stephane Eranian <eranian@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Yonatan Goldschmidt <yonatan.goldschmidt@granulate.io> Link: https://lore.kernel.org/r/20241206204828.507527-6-acme@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit e7a7412df70843354acba617ec71af0fe4998ad6)
1 parent 8fdd1df commit 678e03f

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

tools/perf/util/namespaces.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ pid_t nsinfo__pid(const struct nsinfo *nsi)
266266
return RC_CHK_ACCESS(nsi)->pid;
267267
}
268268

269-
pid_t nsinfo__in_pidns(const struct nsinfo *nsi)
269+
bool nsinfo__in_pidns(const struct nsinfo *nsi)
270270
{
271271
return RC_CHK_ACCESS(nsi)->in_pidns;
272272
}

tools/perf/util/namespaces.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void nsinfo__clear_need_setns(struct nsinfo *nsi);
5858
pid_t nsinfo__tgid(const struct nsinfo *nsi);
5959
pid_t nsinfo__nstgid(const struct nsinfo *nsi);
6060
pid_t nsinfo__pid(const struct nsinfo *nsi);
61-
pid_t nsinfo__in_pidns(const struct nsinfo *nsi);
61+
bool nsinfo__in_pidns(const struct nsinfo *nsi);
6262
void nsinfo__set_in_pidns(struct nsinfo *nsi);
6363

6464
void nsinfo__mountns_enter(struct nsinfo *nsi, struct nscookie *nc);

0 commit comments

Comments
 (0)