diff options
| author | Mark Wielaard <mjw@redhat.com> | 2009-02-20 14:56:38 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2009-02-20 14:56:38 +0100 |
| commit | 02615365a92ca2570c1f96abc8a97674aa2ccae1 (patch) | |
| tree | ebedfd91a0f6d299b39e84295e091e12c0767dc8 /runtime/transport/relayfs.c | |
| parent | c3bad3042df505a3470f1e20b09822a9df1d4761 (diff) | |
| parent | adc67597f327cd43d58b1d0cb740dab14a75a058 (diff) | |
| download | systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.tar.gz systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.tar.xz systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.zip | |
Merge branch 'master' into pr6866
Conflicts:
ChangeLog: Removed
runtime/ChangeLog: Removed
runtime/sym.c: Merged
runtime/task_finder.c: Merged
tapset/ChangeLog: Removed
testsuite/ChangeLog: Removed
Diffstat (limited to 'runtime/transport/relayfs.c')
| -rw-r--r-- | runtime/transport/relayfs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/transport/relayfs.c b/runtime/transport/relayfs.c index 6c516d66..6eefda8d 100644 --- a/runtime/transport/relayfs.c +++ b/runtime/transport/relayfs.c @@ -68,16 +68,16 @@ static void _stp_remove_relay_dir(struct dentry *dir) static void _stp_remove_relay_root(struct dentry *root) { if (root) { - if (!_stp_lock_debugfs()) { + if (!_stp_lock_transport_dir()) { errk("Unable to lock transport directory.\n"); return; } _stp_remove_relay_dir(root); - _stp_unlock_debugfs(); + _stp_unlock_transport_dir(); } } -struct utt_trace *utt_trace_setup(struct utt_trace_setup *utts) +static struct utt_trace *utt_trace_setup(struct utt_trace_setup *utts) { struct utt_trace *utt; int i; @@ -122,13 +122,13 @@ err: return NULL; } -void utt_set_overwrite(int overwrite) +static void utt_set_overwrite(int overwrite) { if (_stp_utt) _stp_utt->rchan->overwrite = overwrite; } -int utt_trace_startstop(struct utt_trace *utt, int start, +static int utt_trace_startstop(struct utt_trace *utt, int start, unsigned int *trace_seq) { int ret; @@ -163,7 +163,7 @@ int utt_trace_startstop(struct utt_trace *utt, int start, } -int utt_trace_remove(struct utt_trace *utt) +static int utt_trace_remove(struct utt_trace *utt) { dbug_trans(1, "removing relayfs files. %d\n", utt->trace_state); if (utt && (utt->trace_state == Utt_trace_setup || utt->trace_state == Utt_trace_stopped)) { |