Changeset 55

Timestamp:

12/09/98 16:11:32 (10 years ago)

Author:

frodo

Message:

Module use count trick expanded to all files and directories

Also fixed a minor Makefile typo.

Files:

• lm-sensors/trunk/TODO (modified) (1 diff)
• lm-sensors/trunk/i2c/eeprom/Module.mk (modified) (1 diff)
• lm-sensors/trunk/kernel/i2c-proc.c (modified) (4 diffs)
• lm-sensors/trunk/kernel/sensors.c (modified) (4 diffs)
• lm-sensors/trunk/src/i2c-proc.c (modified) (4 diffs)
• lm-sensors/trunk/src/sensors.c (modified) (4 diffs)

lm-sensors/trunk/TODO

@@ -15 +15 @@
-  places, probably (everywhere where global vars are accessed). This must be
-  done for the i2c modules, too.
-* Extend the mod_inc_use/mod_dec_use through the fill_inode trick, for all
-  new /proc files.
-* Make lm78.c detect 'double hits', (same chip connected to both SMBus and
-  ISA).

lm-sensors/trunk/i2c/eeprom/Module.mk

@@ -36 +36 @@
-
-clean-i2c-eeprom:
-d) $(I2CEEPROMSOURCES:.c=.
+rd) $(I2CEEPROMSOURCES:.c=.r
-              $(I2CEEPROMTARGETS)
-clean :: clean-i2c-eeprom

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

@@ -41 +41 @@
-static void i2cproc_inc_use(struct i2c_client *client);
-static void i2cproc_dec_use(struct i2c_client *client);
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+static void monitor_bus_i2c(struct inode *inode, int fill);
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,29))
@@ -81 +85 @@
-    /* ops */           NULL,
-    /* get_info */      &read_bus_i2c
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+    /* fill_inode */    &monitor_bus_i2c
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
-  };
-
@@ -223 +230 @@
-  return 0;
-}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+/* Monitor access to /proc/bus/i2c*; make unloading i2c-proc.o impossible
+   if some process still uses it or some file in it */
+void monitor_bus_i2c(struct inode *inode, int fill)
+{
+  if (fill)
+    MOD_INC_USE_COUNT;
+  else
+    MOD_DEC_USE_COUNT;
+}
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
+
-
-/* This function generates the output for /proc/bus/i2c */
@@ -350 +370 @@
-  }
-  proc_entry->ops = &i2cproc_inode_operations;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+  proc_entry->fill_inode = &monitor_bus_i2c;
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
-#else /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,1,29)) */
-  if (!(proc_entry = kmalloc(sizeof(struct proc_dir_entry)+strlen(name)+1,

lm-sensors/trunk/kernel/sensors.c

@@ -57 +57 @@
-static struct i2c_client *sensors_clients[SENSORS_ENTRY_MAX];
-static unsigned short sensors_inodes[SENSORS_ENTRY_MAX];
-
+
+
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
-
@@ -181 +182 @@
-#endif /* DEBUG */
-  sensors_inodes[id-256] = new_header->ctl_table->child->child->de->low_ino;
-
+dir_
-#endif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
-
@@ -204 +205 @@
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+/* Monitor access for /proc/sys/dev/sensors; make unloading sensors.o 
+   impossible if some process still uses it or some file in it */
-void sensors_fill_inode(struct inode *inode, int fill)
+{
+  if (fill)
+    MOD_INC_USE_COUNT;
+  else
+    MOD_DEC_USE_COUNT;
+}
+
+/* Monitor access for /proc/sys/dev/sensors/* directories; make unloading
+   the corresponding module impossible if some process still uses it or
+   some file in it */
+void sensors_dir_fill_inode(struct inode *inode, int fill)
-{
-  int i;
@@ -568 +582 @@
-  if (! (sensors_proc_header = register_sysctl_table(sensors_proc,0)))
-    return -ENOMEM;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+  sensors_proc_header->ctl_table->child->de->fill_inode = &sensors_fill_inode;
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
-  sensors_initialized ++;
-  return 0;

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

@@ -41 +41 @@
-static void i2cproc_inc_use(struct i2c_client *client);
-static void i2cproc_dec_use(struct i2c_client *client);
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+static void monitor_bus_i2c(struct inode *inode, int fill);
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,29))
@@ -81 +85 @@
-    /* ops */           NULL,
-    /* get_info */      &read_bus_i2c
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+    /* fill_inode */    &monitor_bus_i2c
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
-  };
-
@@ -223 +230 @@
-  return 0;
-}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+/* Monitor access to /proc/bus/i2c*; make unloading i2c-proc.o impossible
+   if some process still uses it or some file in it */
+void monitor_bus_i2c(struct inode *inode, int fill)
+{
+  if (fill)
+    MOD_INC_USE_COUNT;
+  else
+    MOD_DEC_USE_COUNT;
+}
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
+
-
-/* This function generates the output for /proc/bus/i2c */
@@ -350 +370 @@
-  }
-  proc_entry->ops = &i2cproc_inode_operations;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+  proc_entry->fill_inode = &monitor_bus_i2c;
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
-#else /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,1,29)) */
-  if (!(proc_entry = kmalloc(sizeof(struct proc_dir_entry)+strlen(name)+1,

lm-sensors/trunk/src/sensors.c

@@ -57 +57 @@
-static struct i2c_client *sensors_clients[SENSORS_ENTRY_MAX];
-static unsigned short sensors_inodes[SENSORS_ENTRY_MAX];
-
+
+
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
-
@@ -181 +182 @@
-#endif /* DEBUG */
-  sensors_inodes[id-256] = new_header->ctl_table->child->child->de->low_ino;
-
+dir_
-#endif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
-
@@ -204 +205 @@
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+/* Monitor access for /proc/sys/dev/sensors; make unloading sensors.o 
+   impossible if some process still uses it or some file in it */
-void sensors_fill_inode(struct inode *inode, int fill)
+{
+  if (fill)
+    MOD_INC_USE_COUNT;
+  else
+    MOD_DEC_USE_COUNT;
+}
+
+/* Monitor access for /proc/sys/dev/sensors/* directories; make unloading
+   the corresponding module impossible if some process still uses it or
+   some file in it */
+void sensors_dir_fill_inode(struct inode *inode, int fill)
-{
-  int i;
@@ -568 +582 @@
-  if (! (sensors_proc_header = register_sysctl_table(sensors_proc,0)))
-    return -ENOMEM;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+  sensors_proc_header->ctl_table->child->de->fill_inode = &sensors_fill_inode;
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
-  sensors_initialized ++;
-  return 0;