From: Marc Dionne <marc.c.dionne@gmail.com>
Date: Sun, 20 Dec 2009 13:30:07 +0000 (-0500)
Subject: Linux: fix sysctl for 2.6.33
X-Git-Tag: openafs-devel-1_5_69~91
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=9bbd7a211761db6bd9c9412037a35d3024af26cc

Linux: fix sysctl for 2.6.33

The sysctl patch for 2.6.33 was a bit overzealous and ifdef'ed
a few lines that it shouldn't have.

Change-Id: I7033259e567a06ce05b968366e810c5b2688c271
Reviewed-on: http://gerrit.openafs.org/1011
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c
index a2747ad..472562f 100644
--- a/src/afs/LINUX/osi_sysctl.c
+++ b/src/afs/LINUX/osi_sysctl.c
@@ -253,13 +253,11 @@ static ctl_table fs_sysctl_table[] = {
 int
 osi_sysctl_init()
 {
-#if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
 #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
-#endif
     if (!afs_sysctl)
 	return -1;