Changeset 8847

Timestamp:

05/30/11 11:48:53 (2 years ago)

Author:

mtmoore

Message:

fix kernel panic when kernel uses unnumbered sysctl entries. pass CTL_NONE through to UNNUMBERED_OR_VAL #define so the end of the tables are well defined as 0.

Files:

• branches/Orange-Branch/src/kernel/linux-2.6/pvfs2-proc.c (modified) (8 diffs)

branches/Orange-Branch/src/kernel/linux-2.6/pvfs2-proc.c

@@ -436 +436 @@
  */
 #ifdef CTL_UNNUMBERED
-#define UNNUMBERED_OR_VAL(x) CTL_UNNUMBERED
+#define UNNUMBERED_OR_VAL(x) ((x==CTL_NONE) ? CTL_NONE : CTL_UNNUMBERED)
 #else
 #define UNNUMBERED_OR_VAL(x) x
@@ -493 +493 @@
         .extra1 = &acache_rec_extra,
     },
-    { CTL_NAME(0) }
+    { CTL_NAME(CTL_NONE) }
 };
 static ctl_table pvfs2_static_acache_table[] = {
@@ -532 +532 @@
         .extra1 = &static_acache_rec_extra,
     },
-    { CTL_NAME(0) }
+    { CTL_NAME(CTL_NONE) }
 };
 
@@ -572 +572 @@
         .extra1 = &ncache_rec_extra
     },
-    { CTL_NAME(0) }
+    { CTL_NAME(CTL_NONE) }
 };
 static int acache_perf_count = PVFS2_PERF_COUNT_REQUEST_ACACHE;
@@ -602 +602 @@
         .extra1 = &ncache_perf_count
     },
-    { CTL_NAME(0) }
+    { CTL_NAME(CTL_NONE) }
 };
 
@@ -640 +640 @@
         .proc_handler = &proc_dointvec,
     },
-    { CTL_NAME(0) }
+    { CTL_NAME(CTL_NONE) }
 };
 
@@ -763 +763 @@
         .child = pvfs2_stats_table
     },
-    { CTL_NAME(0) }
+    { CTL_NAME(CTL_NONE) }
 };
 static ctl_table fs_table[] = {
@@ -772 +772 @@
         .child = pvfs2_table
     },
-    { CTL_NAME(0) }
+    { CTL_NAME(CTL_NONE) }
 };
 #endif