Support improperly formated device numbers

There are kernel drivers (smblk) which set '-1' as their device major number.
This number is listed in /proc/devices then - but the kernel itself is using
just 12 bits - thus device is accessible via 4095 - there is posted patch
for 3.4 to fix this behavior (0 for auto allocation was mean to be used).

However to still allow using such devices with older kernels add some code
to use same behavior - so cut 12 bits from the major number from /proc/devices.

For now use log_warn() - maybe the severity of the message could be lowered
to just verbose level.

diff --git a/WHATS_NEW b/WHATS_NEW
index 7de7471845673527dd2f5d19449bb44ae41555a3..c3c5296a19f0922681b23c7329281b0add1e4e89 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.96 - 
 ================================
+  Support improperly formated device numbers in /proc/devices (2.02.91).
   Fix fsadm propagation of -e option.
   Fix fsadm parsing of /proc/mounts files (don't check for substrings).
   Fix fsadm usage of arguments with space.

diff --git a/lib/filters/filter.c b/lib/filters/filter.c
index aa1e89c372244fc7d49f030558a39dcf00a23c00..11b94c1514bdcd5bd78aa528f742107845f1b213 100644 (file)
--- a/lib/filters/filter.c
+++ b/lib/filters/filter.c
@@ -196,7 +196,7 @@ static int _scan_proc_dev(const char *proc, const struct dm_config_node *cn)
        size_t dev_len = 0;
        const struct dm_config_value *cv;
        const char *name;
-
+       char *nl;
 
        if (!*proc) {
                log_verbose("No proc filesystem found: using all block device "
@@ -227,7 +227,20 @@ static int _scan_proc_dev(const char *proc, const struct dm_config_node *cn)
 
                /* If it's not a number it may be name of section */
                line_maj = atoi(((char *) (line + i)));
-               if ((line_maj <= 0) || (line_maj >= NUMBER_OF_MAJORS)) {
+
+               if (line_maj < 0 || line_maj >= NUMBER_OF_MAJORS) {
+                       /*
+                        * Device numbers shown in /proc/devices are actually direct
+                        * numbers passed to registering function, however the kernel
+                        * uses only 12 bits, so use just 12 bits for major.
+                        */
+                       if ((nl = strchr(line, '\n'))) *nl = '\0';
+                       log_warn("WARNING: /proc/devices line: %s, replacing major with %d.",
+                                line, line_maj & (NUMBER_OF_MAJORS - 1));
+                       line_maj &= (NUMBER_OF_MAJORS - 1);
+               }
+
+               if (!line_maj) {
                        blocksection = (line[i] == 'B') ? 1 : 0;
                        continue;
                }