summaryrefslogtreecommitdiffstats
path: root/runtime/staprun
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-09-16 12:18:50 -0400
committerDave Brolley <brolley@redhat.com>2009-09-16 12:18:50 -0400
commit0f4a9cb5967714ace01e0941592040b8c1d83ee7 (patch)
treef97784dbd9392694931c1be99abf7920f6f0484b /runtime/staprun
parentd83d7b513d38791751e46a05e382b1e6876abefc (diff)
parentd833f810e4ffaf5c9c16eebc7f10b9d14e53e508 (diff)
downloadsystemtap-steved-0f4a9cb5967714ace01e0941592040b8c1d83ee7.tar.gz
systemtap-steved-0f4a9cb5967714ace01e0941592040b8c1d83ee7.tar.xz
systemtap-steved-0f4a9cb5967714ace01e0941592040b8c1d83ee7.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime/staprun')
-rw-r--r--runtime/staprun/relay_old.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/staprun/relay_old.c b/runtime/staprun/relay_old.c
index 71d8acee..0254173f 100644
--- a/runtime/staprun/relay_old.c
+++ b/runtime/staprun/relay_old.c
@@ -110,7 +110,8 @@ static int open_oldoutfile(int fnum, int cpu, int remove_file)
perr("Couldn't open output file %s", buf);
return -1;
}
- if (set_clexec(fileno(percpu_tmpfile[cpu])) < 0) {
+ out_fd[cpu] = fileno(percpu_tmpfile[cpu]);
+ if (set_clexec(out_fd[cpu]) < 0) {
perr("Couldn't clear exec bit of open output file %s", buf);
return -1;
}
@@ -181,7 +182,8 @@ static int open_relayfs_files(int cpu, const char *relay_filebase, const char *p
perr("Couldn't open output file %s", tmp);
goto err2;
}
- if (set_clexec(fileno(percpu_tmpfile[cpu])) < 0) {
+ out_fd[cpu] = fileno(percpu_tmpfile[cpu]);
+ if (set_clexec(out_fd[cpu]) < 0) {
perr("Couldn't open output file %s", tmp);
goto err2;
}