|
 |
8ca3af |
commit 1f608d21322339afad8cea32bcbbc840a0f5191a
|
|
|
8ca3af |
Author: Frank Ch. Eigler <fche@redhat.com>
|
|
|
8ca3af |
Date: Tue Nov 10 20:15:48 2020 -0500
|
|
|
8ca3af |
|
|
|
8ca3af |
PR26665: relayfs-on-procfs megapatch, rhel6 tweaks
|
|
|
8ca3af |
|
|
|
8ca3af |
A few more compatibility macros needed to be moved over to transport/procfs.c.
|
|
|
8ca3af |
|
|
|
8ca3af |
diff --git a/runtime/procfs.c b/runtime/procfs.c
|
|
|
8ca3af |
index 121b12fe3..c2b5aacf2 100644
|
|
|
8ca3af |
--- a/runtime/procfs.c
|
|
|
8ca3af |
+++ b/runtime/procfs.c
|
|
|
8ca3af |
@@ -27,10 +27,6 @@
|
|
|
8ca3af |
#include "proc_fs_compatibility.h"
|
|
|
8ca3af |
#include "uidgid_compatibility.h"
|
|
|
8ca3af |
|
|
|
8ca3af |
-#if defined(STAPCONF_PATH_LOOKUP) && !defined(STAPCONF_KERN_PATH_PARENT)
|
|
|
8ca3af |
-#define kern_path_parent(name, nameidata) \
|
|
|
8ca3af |
- path_lookup(name, LOOKUP_PARENT, nameidata)
|
|
|
8ca3af |
-#endif
|
|
|
8ca3af |
|
|
|
8ca3af |
/* If STAPCONF_PDE_DATA isn't defined, we're using the original /proc
|
|
|
8ca3af |
* interface (where 'struct proc_dir_entry' isn't opaque). In this
|
|
|
8ca3af |
diff --git a/runtime/transport/procfs.c b/runtime/transport/procfs.c
|
|
|
8ca3af |
index 520e17cd5..262409356 100644
|
|
|
8ca3af |
--- a/runtime/transport/procfs.c
|
|
|
8ca3af |
+++ b/runtime/transport/procfs.c
|
|
|
8ca3af |
@@ -10,7 +10,12 @@
|
|
|
8ca3af |
*/
|
|
|
8ca3af |
|
|
|
8ca3af |
#include "relay_compat.h"
|
|
|
8ca3af |
+#include "proc_fs_compatibility.h"
|
|
|
8ca3af |
|
|
|
8ca3af |
+#if defined(STAPCONF_PATH_LOOKUP) && !defined(STAPCONF_KERN_PATH_PARENT)
|
|
|
8ca3af |
+#define kern_path_parent(name, nameidata) \
|
|
|
8ca3af |
+ path_lookup(name, LOOKUP_PARENT, nameidata)
|
|
|
8ca3af |
+#endif
|
|
|
8ca3af |
|
|
|
8ca3af |
/* _stp_procfs_module_dir is the '/proc/systemtap/{module_name}' directory. */
|
|
|
8ca3af |
static struct proc_dir_entry *_stp_procfs_module_dir = NULL;
|
|
|
8ca3af |
@@ -27,6 +32,7 @@ static struct path _stp_procfs_module_dir_path;
|
|
|
8ca3af |
static int _stp_mkdir_proc_module(void)
|
|
|
8ca3af |
{
|
|
|
8ca3af |
int found = 0;
|
|
|
8ca3af |
+ int rc;
|
|
|
8ca3af |
static char proc_root_name[STP_MODULE_NAME_LEN + sizeof("systemtap/")];
|
|
|
8ca3af |
#if defined(STAPCONF_PATH_LOOKUP) || defined(STAPCONF_KERN_PATH_PARENT)
|
|
|
8ca3af |
struct nameidata nd;
|
|
|
8ca3af |
@@ -35,7 +41,6 @@ static int _stp_mkdir_proc_module(void)
|
|
|
8ca3af |
#if defined(STAPCONF_VFS_PATH_LOOKUP)
|
|
|
8ca3af |
struct vfsmount *mnt;
|
|
|
8ca3af |
#endif
|
|
|
8ca3af |
- int rc;
|
|
|
8ca3af |
#endif /* STAPCONF_VFS_PATH_LOOKUP or STAPCONF_KERN_PATH */
|
|
|
8ca3af |
|
|
|
8ca3af |
if (_stp_procfs_module_dir != NULL)
|