Changeset 6017

Timestamp:

01/31/12 13:54:03 (4 months ago)

Author:

khali

Message:

Upcoming change in sysfs will break the way libsensors detects if
sysfs is mounted. Adjust the implementation so that it still works after
said change.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• lib/sysfs.c (modified) (3 diffs)

lm-sensors/trunk/CHANGES

@@ -4 +4 @@
 SVN HEAD
   libsensors: Added support for new sysfs attributes
+              Change sysfs detection to survive upcoming kernel changes
   sensors: Added support for new sysfs attributes
            Display both instantaneous and average power if available.

lm-sensors/trunk/lib/sysfs.c

@@ -25 +25 @@
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/vfs.h>
 #include <unistd.h>
 #include <string.h>
@@ -41 +42 @@
 
 #define ATTR_MAX        128
+#define SYSFS_MAGIC     0x62656572
 
 /*
@@ -594 +596 @@
 int sensors_init_sysfs(void)
 {
-        struct stat statbuf;
+        struct statfs statfsbuf;
 
         snprintf(sensors_sysfs_mount, NAME_MAX, "%s", "/sys");
-        if (stat(sensors_sysfs_mount, &statbuf) < 0
-         || statbuf.st_nlink <= 2)      /* Empty directory */
+        if (statfs(sensors_sysfs_mount, &statfsbuf) < 0
+         || statfsbuf.f_type != SYSFS_MAGIC)
                 return 0;