git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
LINUX 5.3.0: Check for 'recurse' arg in keyring_search
[openafs.git] / src / afs / LINUX / osi_sysctl.c
diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c
index eaee80a..5602c3d 100644 (file)
--- a/src/afs/LINUX/osi_sysctl.c
+++ b/src/afs/LINUX/osi_sysctl.c
@@ -14,7 +14,12 @@
 #include "afs/afs_stats.h"     /* afs statistics */
 
 #include <linux/sysctl.h>
+#ifdef HAVE_LINUX_CONFIG_H
 #include <linux/config.h>
+#endif
+
+/* From afs_util.c */
+extern afs_int32 afs_md5inum;
 
 /* From afs_analyze.c */
 extern afs_int32 hm_retry_RO;
@@ -29,71 +34,234 @@ extern afs_int32 afs_pct2;
 #ifdef CONFIG_SYSCTL
 static struct ctl_table_header *afs_sysctl = NULL;
 
-static ctl_table afs_sysctl_table[] = {
-    {1, "hm_retry_RO",
-     &hm_retry_RO, sizeof(afs_int32), 0644, NULL,
-     &proc_dointvec}
-    ,
-    {2, "hm_retry_RW",
-     &hm_retry_RW, sizeof(afs_int32), 0644, NULL,
-     &proc_dointvec}
-    ,
-    {3, "hm_retry_int",
-     &hm_retry_int, sizeof(afs_int32), 0644, NULL,
-     &proc_dointvec}
-    ,
-    {4, "GCPAGs",
-     &afs_gcpags, sizeof(afs_int32), 0644, NULL,
-     &proc_dointvec}
-    ,
-    {5, "rx_deadtime",
-     &afs_rx_deadtime, sizeof(afs_int32), 0644, NULL,
-     &proc_dointvec}
-    ,
-    {6, "bkVolPref",
-     &afs_bkvolpref, sizeof(afs_int32), 0644, NULL,
-     &proc_dointvec}
-    ,
-    {7, "afs_blocksUsed",
-     &afs_blocksUsed, sizeof(afs_int32), 0444, NULL,
-     &proc_dointvec}
-    ,
-    {8, "afs_blocksUsed_0",
-     &afs_blocksUsed_0, sizeof(afs_int32), 0644, NULL,
-     &proc_dointvec}
-    ,
-    {9, "afs_blocksUsed_1",
-     &afs_blocksUsed_1, sizeof(afs_int32), 0644, NULL,
-     &proc_dointvec}
-    ,
-    {10, "afs_blocksUsed_2",
-     &afs_blocksUsed_2, sizeof(afs_int32), 0644, NULL,
-     &proc_dointvec}
-    ,
-    {11, "afs_pct1",
-     &afs_pct1, sizeof(afs_int32), 0644, NULL,
-     &proc_dointvec}
-    ,
-    {12, "afs_pct2",
-     &afs_pct2, sizeof(afs_int32), 0644, NULL,
-     &proc_dointvec}
-    ,
-    {13, "afs_cacheBlocks",
-     &afs_cacheBlocks, sizeof(afs_int32), 0644, NULL,
-     &proc_dointvec}
-    ,
-    {0}
+static struct ctl_table afs_sysctl_table[] = {
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 1,
+#endif
+#endif
+       .procname       = "hm_retry_RO",
+       .data           = &hm_retry_RO,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 2,
+#endif
+#endif
+       .procname       = "hm_retry_RW",
+       .data           = &hm_retry_RW,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 3,
+#endif
+#endif
+       .procname       = "hm_retry_int",
+       .data           = &hm_retry_int,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 4,
+#endif
+#endif
+       .procname       = "GCPAGs",
+       .data           = &afs_gcpags,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 5,
+#endif
+#endif
+       .procname       = "rx_deadtime",
+       .data           = &afs_rx_deadtime,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 6,
+#endif
+#endif
+       .procname       = "bkVolPref",
+       .data           = &afs_bkvolpref,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 7,
+#endif
+#endif
+       .procname       = "afs_blocksUsed",
+       .data           = &afs_blocksUsed,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0444,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 8,
+#endif
+#endif
+       .procname       = "afs_blocksUsed_0",
+       .data           = &afs_blocksUsed_0,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 9,
+#endif
+#endif
+       .procname       = "afs_blocksUsed_1",
+       .data           = &afs_blocksUsed_1,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 10,
+#endif
+#endif
+       .procname       = "afs_blocksUsed_2",
+       .data           = &afs_blocksUsed_2,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 11,
+#endif
+#endif
+       .procname       = "afs_pct1",
+       .data           = &afs_pct1,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 12,
+#endif
+#endif
+       .procname       = "afs_pct2",
+       .data           = &afs_pct2,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 13,
+#endif
+#endif
+       .procname       = "afs_cacheBlocks",
+       .data           = &afs_cacheBlocks,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 14,
+#endif
+#endif
+       .procname       = "md5inum",
+       .data           = &afs_md5inum,
+       .maxlen         = sizeof(afs_int32),
+       .mode           = 0644,
+       .proc_handler   = &proc_dointvec
+    },
+    {
+       .procname       = 0
+    }
 };
 
-static ctl_table fs_sysctl_table[] = {
-    {1, "afs", NULL, 0, 0555, afs_sysctl_table},
-    {0}
+static struct ctl_table fs_sysctl_table[] = {
+    {
+#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
+#if defined(CTL_UNNUMBERED)
+       .ctl_name       = CTL_UNNUMBERED,
+#else
+       .ctl_name       = 1,
+#endif
+#endif
+       .procname       = "afs",
+       .mode           = 0555,
+       .child          = afs_sysctl_table
+    },
+    {
+       .procname       = 0
+    }
 };
 
 int
 osi_sysctl_init()
 {
+#if defined(REGISTER_SYSCTL_TABLE_NOFLAG)
+    afs_sysctl = register_sysctl_table(fs_sysctl_table);
+#else
     afs_sysctl = register_sysctl_table(fs_sysctl_table, 0);
+#endif
     if (!afs_sysctl)
        return -1;
 
OpenAFS Master Repository