PR33574: runtime/linux/stap_fs.h incompatible with kernel-6.18

Kernel 6.18 comes with commit 4055526d3 which moves ns type from struct proc_ns_operations into struct ns_common. This commit reflects that in systemtap runtime. 

3 files changed, 8 insertions, 0 deletions

diff --git a/buildrun.cxx b/buildrun.cxx
index 1f56a976b..c3e38a2db 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -402,6 +402,7 @@ compile_pass (systemtap_session& s)
  output_autoconf(s, o, cs, "autoconf-pr32194-uprobe-register-unregister.c", "STAPCONF_PR32194_UPROBE_REGISTER_UNREGISTER", NULL);
  output_autoconf(s, o, cs, "autoconf-uprobes-cb-data.c", "STAPCONF_UPROBES_CB_DATA", NULL);
  output_autoconf(s, o, cs, "autoconf-pr33324-prev_padding.c", "STAPCONF_PR33324_PREV_PADDING", NULL);
+ output_autoconf(s, o, cs, "autoconf-pr33574-pno-type.c", "STAPCONF_PR33574_PNO_TYPE", NULL);
  
  output_dual_exportconf(s, o2, "probe_kernel_read", "probe_kernel_write", "STAPCONF_PROBE_KERNEL");
  output_autoconf(s, o, cs, "autoconf-hw_breakpoint_context.c",
diff --git a/runtime/linux/autoconf-pr33574-pno-type.c b/runtime/linux/autoconf-pr33574-pno-type.c
new file mode 100644
index 000000000..572816d52
--- /dev/null
+++ b/runtime/linux/autoconf-pr33574-pno-type.c
@@ -0,0 +1,3 @@
+#include <linux/proc_ns.h>
+
+struct proc_ns_operations pno __attribute__ ((unused)) = {.type = 0x0};
diff --git a/runtime/linux/stap_fs.h b/runtime/linux/stap_fs.h
index 3fee5d3ec..12b97b0e8 100644
--- a/runtime/linux/stap_fs.h
+++ b/runtime/linux/stap_fs.h
@@ -69,7 +69,11 @@ stap_set_mnt_ns(int fd)
  goto out;
 
  ns = get_proc_ns(file_inode(file));
+#if defined(STAPCONF_PR33574_PNO_TYPE)
  if (ns->ops->type != CLONE_NEWNS) {
+#else
+ if (ns->ns_type != CLONE_NEWNS) {
+#endif
  err = -EINVAL;
  goto out;
  }