Changeset 83

Timestamp:

Jan 16, 2007, 11:49:23 PM (18 years ago)

Author:

rainer

Message:

Fix for ticket #46 (kernel check issue with 2.6.19).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_kern.c (modified) (5 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 2.3.1:
+        * fix sh_kern.c for kernel 2.6.19 (reported by S. Clormann)
         * don't use sstrip in 'make deb', since dh_shlibdeps uses objdump
           (reported by B. Masuda)

trunk/src/sh_kern.c

@@ -313 +313 @@
                            int * size, int direction)
 {
-  char          path[128];
-  char        * p = NULL;
-  unsigned long x1, x2;
-  char        * name = (char *) in_name;
+  char            path[128];
+  char          * p = NULL;
+  unsigned long   x1 = 0, x2 = 0;
+  unsigned char * name = (unsigned char *) in_name;
 
   sl_snprintf(path, 128, "K_%s_%04d", prefix, num);
@@ -423 +423 @@
 
 #ifdef SH_PROC_CHECK
+
+/*
+ * Defined in include/linux/fs.h
+ */
+
+/* Here. we are only interested in 'lookup'. I.e. the struct
+ * must be <= the real one, and 'lookup' must be at the 
+ * correct position.
+ */
 struct inode_operations {
   int (*create) (int *,int *,int);
@@ -450 +459 @@
 };
 
-/* this one is just for dummy purposes
+/* 
+ * this one is just for dummy purposes
  */
 struct file_operations {
@@ -456 +466 @@
 };
 
+/* Defined in include/linux/proc_fs.h
+ * Here we are interested in the 'proc_iops' member.
+ */
 struct proc_dir_entry {
   unsigned short low_ino;
@@ -900 +913 @@
                        _("proc_root_inode_operations.lookup != proc_root_lookup"));
     }
-  else if ( ( ((unsigned int) * &proc_root_dir.proc_iops) != proc_root_iops) 
-            && (proc_root_dir.size != proc_root_iops))
+  else if (    (((unsigned int) * &proc_root_dir.proc_iops) != proc_root_iops)
+            && (proc_root_dir.size != proc_root_iops)
+            && (((unsigned int) * &proc_root_dir.proc_fops) != proc_root_iops)
+            )
     {
       sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_KERN_PROC,