summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorDavid Smith <dsmith@redhat.com>2009-09-09 12:27:02 -0500
committerDavid Smith <dsmith@redhat.com>2009-09-09 12:27:02 -0500
commit3cb3a7dd723bf5219e5cd97d5160b7bce59ba0b4 (patch)
treef4c19df4a961dd05a3a09bfe258418dd57873772 /runtime
parentc2eefc9f0d8a601e4732d80ca5660b5748991595 (diff)
parentddc0ddd0bc88d370addadcd3a9381e410e7b73cc (diff)
downloadsystemtap-steved-3cb3a7dd723bf5219e5cd97d5160b7bce59ba0b4.tar.gz
systemtap-steved-3cb3a7dd723bf5219e5cd97d5160b7bce59ba0b4.tar.xz
systemtap-steved-3cb3a7dd723bf5219e5cd97d5160b7bce59ba0b4.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime')
-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;
}