5 files changed, 32 insertions, 11 deletions

diff --git a/runtime/transport/ChangeLog b/runtime/transport/ChangeLog
index 02f9f119..f1a5a89b 100644
--- a/runtime/transport/ChangeLog
+++ b/runtime/transport/ChangeLog
@@ -1,3 +1,20 @@
+2009-02-12  David Smith  <dsmith@redhat.com>
+
+	* transport.c (_stp_lock_transport_dir): Renamed from
+	_stp_lock_debugfs(), since on older kernels this actually uses
+	procfs.
+	(_stp_unlock_transport_dir): Renamed from _stp_unlock_debugfs(),
+	since on older kernels this actually uses procfs.
+	(_stp_lock_transport_dir): Changed
+	_stp_lock_debugfs()/_stp_unlock_debugfs() to
+	_stp_lock_transport_dir()/_stp_unlock_transport_dir().
+	* transport.h: Ditto.  Also added _stp_transport_init()
+	prototype.
+	* utt.c (utt_remove_root): Changed
+	_stp_lock_debugfs()/_stp_unlock_debugfs() to
+	_stp_lock_transport_dir()/_stp_unlock_transport_dir().
+	* relayfs.c (_stp_remove_relay_root): Ditto.
+
 2009-02-05  Frank Ch. Eigler  <fche@elastic.org>
 
 	PR9740/9816?
diff --git a/runtime/transport/relayfs.c b/runtime/transport/relayfs.c
index 5bd3ff4d..6eefda8d 100644
--- a/runtime/transport/relayfs.c
+++ b/runtime/transport/relayfs.c
@@ -68,12 +68,12 @@ 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();
 	}
 }
 
diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c
index 97fbf860..79da2101 100644
--- a/runtime/transport/transport.c
+++ b/runtime/transport/transport.c
@@ -311,7 +311,7 @@ static inline void _stp_unlock_inode(struct inode *inode)
 
 static struct dentry *_stp_lockfile = NULL;
 
-static int _stp_lock_debugfs(void)
+static int _stp_lock_transport_dir(void)
 {
 	int numtries = 0;
 #ifdef STP_OLD_TRANSPORT
@@ -326,7 +326,7 @@ static int _stp_lock_debugfs(void)
 	return 1;
 }
 
-static void _stp_unlock_debugfs(void)
+static void _stp_unlock_transport_dir(void)
 {
 	if (_stp_lockfile) {
 #ifdef STP_OLD_TRANSPORT
@@ -359,7 +359,7 @@ static struct dentry *_stp_get_root_dir(const char *name)
 		return NULL;
 	}
 
-	if (!_stp_lock_debugfs()) {
+	if (!_stp_lock_transport_dir()) {
 		errk("Couldn't lock transport directory.\n");
 		return NULL;
 	}
@@ -381,7 +381,7 @@ static struct dentry *_stp_get_root_dir(const char *name)
 			errk("Could not create or find transport directory.\n");
 		}
 	}
-	_stp_unlock_debugfs();
+	_stp_unlock_transport_dir();
 	return root;
 }
 
diff --git a/runtime/transport/transport.h b/runtime/transport/transport.h
index 11a070de..7d249c45 100644
--- a/runtime/transport/transport.h
+++ b/runtime/transport/transport.h
@@ -26,13 +26,17 @@
 static unsigned _stp_nsubbufs = 8;
 static unsigned _stp_subbuf_size = 65536*4;
 
-static void _stp_warn (const char *fmt, ...);
+static int _stp_transport_init(void);
 static void _stp_transport_close(void);
+
+static void _stp_warn (const char *fmt, ...);
 static int _stp_print_init(void);
 static void _stp_print_cleanup(void);
 static struct dentry *_stp_get_root_dir(const char *name);
-static int _stp_lock_debugfs(void);
-static void _stp_unlock_debugfs(void);
+
+static int _stp_lock_transport_dir(void);
+static void _stp_unlock_transport_dir(void);
+
 static void _stp_attach(void);
 static void _stp_detach(void);
 static void _stp_handle_start(struct _stp_msg_start *st);
diff --git a/runtime/transport/utt.c b/runtime/transport/utt.c
index 59060474..915662b2 100644
--- a/runtime/transport/utt.c
+++ b/runtime/transport/utt.c
@@ -130,13 +130,13 @@ static void utt_set_overwrite(int overwrite)
 static void utt_remove_root(struct utt_trace *utt)
 {
 	if (utt->utt_tree_root) {
-		if (!_stp_lock_debugfs()) {
+		if (!_stp_lock_transport_dir()) {
 			errk("Unable to lock transport directory.\n");
 			return;
 		}
 		if (simple_empty(utt->utt_tree_root))
 			debugfs_remove(utt->utt_tree_root);
-		_stp_unlock_debugfs();
+		_stp_unlock_transport_dir();
 		utt->utt_tree_root = NULL;
 	}
 }