Changeset 46

Timestamp:

12/07/98 23:15:49 (14 years ago)

Author:

frodo

Message:

Module use count fix

This fix will only work for kernels >= 2.1.58.

* lm75, lm78: {INC,DEC}_MOD_USE_COUNT called for {inc,dec}_mod_use hooks
* sensors: For new kernels, fill_inode is called, which in turn calls

{inc,dec}_mod_use for a certain client

Location:

lm-sensors/trunk

Files:

• kernel/chips/lm75.c (modified) (2 diffs)
• kernel/chips/lm78.c (modified) (2 diffs)
• kernel/i2c-proc.c (modified) (1 diff)
• kernel/sensors.c (modified) (4 diffs)
• src/i2c-proc.c (modified) (1 diff)
• src/lm75.c (modified) (2 diffs)
• src/lm78.c (modified) (2 diffs)
• src/sensors.c (modified) (4 diffs)

lm-sensors/trunk/kernel/chips/lm75.c

@@ -222 +222 @@
 void lm75_inc_use (struct i2c_client *client)
 {
+#ifdef MODULE
+  MOD_INC_USE_COUNT;
+#endif
 }
 
@@ -227 +230 @@
 void lm75_dec_use (struct i2c_client *client)
 {
+#ifdef MODULE
+  MOD_DEC_USE_COUNT;
+#endif
 }
 

lm-sensors/trunk/kernel/chips/lm78.c

@@ -584 +584 @@
 void lm78_inc_use (struct i2c_client *client)
 {
+#ifdef MODULE
+  MOD_INC_USE_COUNT;
+#endif
 }
 
@@ -589 +592 @@
 void lm78_dec_use (struct i2c_client *client)
 {
+#ifdef MODULE
+  MOD_DEC_USE_COUNT;
+#endif
 }
  

lm-sensors/trunk/kernel/i2c-proc.c

@@ -436 +436 @@
 }
 
-
 #ifdef MODULE
 

lm-sensors/trunk/kernel/sensors.c

@@ -22 +22 @@
 #include <linux/ctype.h>
 #include <linux/sysctl.h>
+#include <linux/proc_fs.h>
 
 #include "version.h"
@@ -47 +48 @@
 #define SENSORS_ENTRY_MAX 20
 static struct ctl_table_header *sensors_entries[SENSORS_ENTRY_MAX];
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+static struct i2c_client *sensors_clients[SENSORS_ENTRY_MAX];
+static unsigned short sensors_inodes[SENSORS_ENTRY_MAX];
+void sensors_fill_inode(struct inode *inode, int fill);
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
 
 static ctl_table sysctl_table[] = {
@@ -136 +143 @@
   sensors_entries[id-256] = new_header;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+  sensors_clients[id-256] = client;
+#ifdef DEBUG
+  if (!new_header || !new_header->ctl_table || 
+      !new_header->ctl_table->child || 
+      !new_header->ctl_table->child->child ||
+      !new_header->ctl_table->child->child->de) {
+    printk("sensors.o: NULL pointer when trying to install fill_inode fix!\n");
+    return id;  
+  }
+#endif /* DEBUG */
+  sensors_inodes[id-256] = new_header->ctl_table->child->child->de->low_ino;
+  new_header->ctl_table->child->child->de->fill_inode = &sensors_fill_inode;
+#endif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+
   return id;
 }
@@ -148 +170 @@
     kfree((void *) (table[4].procname));
     kfree(table);
-    sensors_entries[id] = 0;
-  }
-}
+    sensors_entries[id] = NULL;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+    sensors_clients[id-256] = NULL;
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
+  }
+}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+void sensors_fill_inode(struct inode *inode, int fill)
+{
+  int i;
+  struct i2c_client *client;
+
+#ifdef DEBUG
+  if (! inode) {
+    printk("sensors.o: Warning: inode NULL in fill_inode()\n");
+    return;
+  }
+#endif /* def DEBUG */
+  
+  for (i = 0; i < SENSORS_ENTRY_MAX; i++) 
+    if (sensors_clients[i] && (sensors_inodes[i] == inode->i_ino))
+      break;
+#ifdef DEBUG
+  if (i == SENSORS_ENTRY_MAX) {
+    printk("sensors.o: Warning: inode (%ld) not found in fill_inode()\n",
+           inode->i_ino);
+    return;
+  }
+#endif /* def DEBUG */
+  client = sensors_clients[i];
+  if (fill)
+    client->driver->inc_use(client);
+  else
+    client->driver->dec_use(client);
+}
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
 
 /* This funcion reads or writes a 'real' value (encoded by the combination

lm-sensors/trunk/src/i2c-proc.c

@@ -436 +436 @@
 }
 
-
 #ifdef MODULE
 

lm-sensors/trunk/src/lm75.c

@@ -222 +222 @@
 void lm75_inc_use (struct i2c_client *client)
 {
+#ifdef MODULE
+  MOD_INC_USE_COUNT;
+#endif
 }
 
@@ -227 +230 @@
 void lm75_dec_use (struct i2c_client *client)
 {
+#ifdef MODULE
+  MOD_DEC_USE_COUNT;
+#endif
 }
 

lm-sensors/trunk/src/lm78.c

@@ -584 +584 @@
 void lm78_inc_use (struct i2c_client *client)
 {
+#ifdef MODULE
+  MOD_INC_USE_COUNT;
+#endif
 }
 
@@ -589 +592 @@
 void lm78_dec_use (struct i2c_client *client)
 {
+#ifdef MODULE
+  MOD_DEC_USE_COUNT;
+#endif
 }
  

lm-sensors/trunk/src/sensors.c

@@ -22 +22 @@
 #include <linux/ctype.h>
 #include <linux/sysctl.h>
+#include <linux/proc_fs.h>
 
 #include "version.h"
@@ -47 +48 @@
 #define SENSORS_ENTRY_MAX 20
 static struct ctl_table_header *sensors_entries[SENSORS_ENTRY_MAX];
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+static struct i2c_client *sensors_clients[SENSORS_ENTRY_MAX];
+static unsigned short sensors_inodes[SENSORS_ENTRY_MAX];
+void sensors_fill_inode(struct inode *inode, int fill);
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
 
 static ctl_table sysctl_table[] = {
@@ -136 +143 @@
   sensors_entries[id-256] = new_header;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+  sensors_clients[id-256] = client;
+#ifdef DEBUG
+  if (!new_header || !new_header->ctl_table || 
+      !new_header->ctl_table->child || 
+      !new_header->ctl_table->child->child ||
+      !new_header->ctl_table->child->child->de) {
+    printk("sensors.o: NULL pointer when trying to install fill_inode fix!\n");
+    return id;  
+  }
+#endif /* DEBUG */
+  sensors_inodes[id-256] = new_header->ctl_table->child->child->de->low_ino;
+  new_header->ctl_table->child->child->de->fill_inode = &sensors_fill_inode;
+#endif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+
   return id;
 }
@@ -148 +170 @@
     kfree((void *) (table[4].procname));
     kfree(table);
-    sensors_entries[id] = 0;
-  }
-}
+    sensors_entries[id] = NULL;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+    sensors_clients[id-256] = NULL;
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
+  }
+}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+void sensors_fill_inode(struct inode *inode, int fill)
+{
+  int i;
+  struct i2c_client *client;
+
+#ifdef DEBUG
+  if (! inode) {
+    printk("sensors.o: Warning: inode NULL in fill_inode()\n");
+    return;
+  }
+#endif /* def DEBUG */
+  
+  for (i = 0; i < SENSORS_ENTRY_MAX; i++) 
+    if (sensors_clients[i] && (sensors_inodes[i] == inode->i_ino))
+      break;
+#ifdef DEBUG
+  if (i == SENSORS_ENTRY_MAX) {
+    printk("sensors.o: Warning: inode (%ld) not found in fill_inode()\n",
+           inode->i_ino);
+    return;
+  }
+#endif /* def DEBUG */
+  client = sensors_clients[i];
+  if (fill)
+    client->driver->inc_use(client);
+  else
+    client->driver->dec_use(client);
+}
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
 
 /* This funcion reads or writes a 'real' value (encoded by the combination