git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Linux: fix whitespace in osi_sysctl.c
[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 d6c2d2f..5602c3d 100644 (file)
--- a/src/afs/LINUX/osi_sysctl.c
+++ b/src/afs/LINUX/osi_sysctl.c
@@ -14,12 +14,12 @@
 #include "afs/afs_stats.h"     /* afs statistics */
 
 #include <linux/sysctl.h>
-#ifdef CONFIG_H_EXISTS
+#ifdef HAVE_LINUX_CONFIG_H
 #include <linux/config.h>
 #endif
 
 /* From afs_util.c */
-extern afs_int32 afs_new_inum;
+extern afs_int32 afs_md5inum;
 
 /* From afs_analyze.c */
 extern afs_int32 hm_retry_RO;
@@ -34,130 +34,224 @@ extern afs_int32 afs_pct2;
 #ifdef CONFIG_SYSCTL
 static struct ctl_table_header *afs_sysctl = NULL;
 
-static ctl_table afs_sysctl_table[] = {
+static struct ctl_table afs_sysctl_table[] = {
     {
-       .ctl_name       = 1, 
-       .procname       = "hm_retry_RO",
-       .data           = &hm_retry_RO, 
-       .maxlen         = sizeof(afs_int32), 
-       .mode           = 0644,
+#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
     },
     {
-        .ctl_name      = 2, 
-        .procname      = "hm_retry_RW",
-        .data          = &hm_retry_RW,
-       .maxlen         = sizeof(afs_int32), 
+#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
+       .proc_handler   = &proc_dointvec
     },
     {
-       .ctl_name       = 3, 
+#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), 
+       .data           = &hm_retry_int,
+       .maxlen         = sizeof(afs_int32),
        .mode           = 0644,
        .proc_handler   = &proc_dointvec
     },
     {
-       .ctl_name       = 4, 
+#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), 
+       .data           = &afs_gcpags,
+       .maxlen         = sizeof(afs_int32),
        .mode           = 0644,
-       .proc_handler   = &proc_dointvec
+       .proc_handler   = &proc_dointvec
     },
     {
-       .ctl_name       = 5, 
+#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), 
+       .data           = &afs_rx_deadtime,
+       .maxlen         = sizeof(afs_int32),
        .mode           = 0644,
        .proc_handler   = &proc_dointvec
     },
     {
-       .ctl_name       = 6, 
+#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), 
+       .data           = &afs_bkvolpref,
+       .maxlen         = sizeof(afs_int32),
        .mode           = 0644,
        .proc_handler   = &proc_dointvec
     },
     {
-       .ctl_name       = 7, 
+#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), 
+       .maxlen         = sizeof(afs_int32),
        .mode           = 0444,
        .proc_handler   = &proc_dointvec
     },
     {
-       .ctl_name       = 8, 
+#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
+       .proc_handler   = &proc_dointvec
     },
     {
-       .ctl_name       = 9, 
+#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, 
+       .data           = &afs_blocksUsed_1,
        .maxlen         = sizeof(afs_int32),
        .mode           = 0644,
        .proc_handler   = &proc_dointvec
     },
     {
-       .ctl_name       = 10, 
+#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), 
+       .data           = &afs_blocksUsed_2,
+       .maxlen         = sizeof(afs_int32),
        .mode           = 0644,
        .proc_handler   = &proc_dointvec
     },
     {
-       .ctl_name       = 11, 
+#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, 
+       .data           = &afs_pct1,
        .maxlen         = sizeof(afs_int32),
        .mode           = 0644,
        .proc_handler   = &proc_dointvec
     },
     {
-       .ctl_name       = 12, 
+#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, 
+       .data           = &afs_pct2,
        .maxlen         = sizeof(afs_int32),
        .mode           = 0644,
-       .proc_handler   = &proc_dointvec
+       .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
+       .proc_handler   = &proc_dointvec
     },
     {
-       .ctl_name       = 14, 
+#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_new_inum, 
+       .data           = &afs_md5inum,
        .maxlen         = sizeof(afs_int32),
        .mode           = 0644,
-       .proc_handler   = &proc_dointvec
+       .proc_handler   = &proc_dointvec
     },
-    {0}
+    {
+       .procname       = 0
+    }
 };
 
-static ctl_table fs_sysctl_table[] = {
+static struct ctl_table fs_sysctl_table[] = {
     {
-       .ctl_name       = 1, 
-       .procname       = "afs", 
-       .mode           = 0555, 
+#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
     },
-    {0}
+    {
+       .procname       = 0
+    }
 };
 
 int
OpenAFS Master Repository