From 5c55788859d5a92ad035239fe398b34cd9aca647 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Tue, 12 Jun 2007 19:28:49 +0000
Subject: [PATCH] STABLE14-linux-sysctl-update-20070612

FIXES 61906

2.6.21.1 introduces an additional .parent pointer in the middle of
the structure. As the OpenAFS code just initialises the structure
with a list, this causes it to assign the value intended
for .proc_handler to .parent


(cherry picked from commit a6294ee79a9dc18fad219262b6be69535c0398a9)
---
 src/afs/LINUX/osi_sysctl.c | 79 ++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 25 deletions(-)

diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c
index dbe93dc11..798600156 100644
--- a/src/afs/LINUX/osi_sysctl.c
+++ b/src/afs/LINUX/osi_sysctl.c
@@ -27,35 +27,64 @@ extern afs_int32 hm_retry_int;
 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}
-    ,
+    {
+	.ctl_name 	= 1, 
+	.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), 
+	.mode		= 0644,
+     	.proc_handler	= &proc_dointvec
+    },
+    {
+	.ctl_name	= 3, 
+	.procname	= "hm_retry_int",
+	.data		= &hm_retry_int, 
+	.maxlen		= sizeof(afs_int32), 
+	.mode		= 0644,
+	.proc_handler	= &proc_dointvec
+    },
+    {
+	.ctl_name	= 4, 
+	.procname	= "GCPAGs",
+	.data		= &afs_gcpags, 
+	.maxlen		= sizeof(afs_int32), 
+	.mode		= 0644,
+	.proc_handler 	= &proc_dointvec
+    },
+    {
+	.ctl_name	= 5, 
+	.procname	= "rx_deadtime",
+	.data		= &afs_rx_deadtime, 
+	.maxlen		= sizeof(afs_int32), 
+	.mode		= 0644,
+	.proc_handler	= &proc_dointvec
+    },
+    {
+	.ctl_name	= 6, 
+	.procname	= "bkVolPref",
+	.data		= &afs_bkvolpref, 
+	.maxlen		= sizeof(afs_int32), 
+	.mode		= 0644,
+	.proc_handler	= &proc_dointvec
+    },
     {0}
 };
 
 static ctl_table fs_sysctl_table[] = {
-    {1, "afs", NULL, 0, 0555, afs_sysctl_table},
+    {
+	.ctl_name	= 1, 
+	.procname	= "afs", 
+	.mode		= 0555, 
+	.child		= afs_sysctl_table
+    },
     {0}
 };
 
-- 
2.39.5