UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf namespaces: Introduce nsinfo__mntns_path() accessor to avoid accessing ->mntns_path directly 

To reduce the use of RC_CHK_ACCESS(nsi).

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2023-04-17 22:11:58 -03:00
parent f94c21dfd0
commit 2d1acd3f10
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/perf/util/namespaces.c
View File

@ -177,6 +177,11 @@ struct nsinfo *nsinfo__new(pid_t pid)
return nsi; return nsi;
} }
static const char *nsinfo__mntns_path(const struct nsinfo *nsi)
{
return RC_CHK_ACCESS(nsi)->mntns_path;
}
struct nsinfo *nsinfo__copy(const struct nsinfo *nsi) struct nsinfo *nsinfo__copy(const struct nsinfo *nsi)
{ {
struct nsinfo *nnsi; struct nsinfo *nnsi;
@ -193,8 +198,8 @@ struct nsinfo *nsinfo__copy(const struct nsinfo *nsi)
RC_CHK_ACCESS(nnsi)->nstgid = nsinfo__nstgid(nsi); RC_CHK_ACCESS(nnsi)->nstgid = nsinfo__nstgid(nsi);
RC_CHK_ACCESS(nnsi)->need_setns = nsinfo__need_setns(nsi); RC_CHK_ACCESS(nnsi)->need_setns = nsinfo__need_setns(nsi);
RC_CHK_ACCESS(nnsi)->in_pidns = nsinfo__in_pidns(nsi); RC_CHK_ACCESS(nnsi)->in_pidns = nsinfo__in_pidns(nsi);
if (RC_CHK_ACCESS(nsi)->mntns_path) { if (nsinfo__mntns_path(nsi)) {
RC_CHK_ACCESS(nnsi)->mntns_path = strdup(RC_CHK_ACCESS(nsi)->mntns_path); RC_CHK_ACCESS(nnsi)->mntns_path = strdup(nsinfo__mntns_path(nsi));
if (!RC_CHK_ACCESS(nnsi)->mntns_path) { if (!RC_CHK_ACCESS(nnsi)->mntns_path) {
nsinfo__put(nnsi); nsinfo__put(nnsi);
return NULL; return NULL;
@ -294,7 +299,7 @@ void nsinfo__mountns_enter(struct nsinfo *nsi,
if (oldns < 0) if (oldns < 0)
goto errout; goto errout;
newns = open(RC_CHK_ACCESS(nsi)->mntns_path, O_RDONLY); newns = open(nsinfo__mntns_path(nsi), O_RDONLY);
if (newns < 0) if (newns < 0)
goto errout; goto errout;