diff options
author | Tim Moore <timoore@redhat.com> | 2009-10-07 20:10:17 +0200 |
---|---|---|
committer | Tim Moore <timoore@redhat.com> | 2009-10-07 20:10:17 +0200 |
commit | e6638df404688a1af5e9713befc298984241af5b (patch) | |
tree | a3684cfc7825e9079a021a38732e5d4ce4260c1c /runtime/staprun/staprun.c | |
parent | 9ed28fbc61420dbcfe46828fe5ee35eae3f4dc79 (diff) | |
parent | 038c38c6119e29189be83c3a214c635c0d02ee58 (diff) | |
download | systemtap-steved-e6638df404688a1af5e9713befc298984241af5b.tar.gz systemtap-steved-e6638df404688a1af5e9713befc298984241af5b.tar.xz systemtap-steved-e6638df404688a1af5e9713befc298984241af5b.zip |
Merge commit 'origin/master'
Diffstat (limited to 'runtime/staprun/staprun.c')
-rw-r--r-- | runtime/staprun/staprun.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/runtime/staprun/staprun.c b/runtime/staprun/staprun.c index da3e304b..7b4aba1c 100644 --- a/runtime/staprun/staprun.c +++ b/runtime/staprun/staprun.c @@ -227,14 +227,14 @@ int init_staprun(void) without first removing the kernel module. This would block a subsequent rerun attempt. So here we gingerly try to unload it first. */ - int ret = delete_module (modname, O_NONBLOCK); - err("Retrying, after attempted removal of module %s (rc %d)\n", modname, ret); - /* Then we try an insert a second time. */ - if (insert_stap_module() < 0) - return -1; - } - if (send_relocations() < 0) - return -1; + int ret = delete_module (modname, O_NONBLOCK); + err("Retrying, after attempted removal of module %s (rc %d)\n", modname, ret); + /* Then we try an insert a second time. */ + if (insert_stap_module() < 0) + return -1; + } + if (send_relocations() < 0) + return -1; } return 0; } |