Implement 'revision' matching
PATCH 2/3 Implement 'revision' matching
This patch implements a 'revision' field for the hardware table.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke [email protected] SuSE Linux Products GmbH S390 & zSeries Maxfeldstraße 5 +49 911 74053 688 90409 Nürnberg http://www.suse.de
[libmultipath] Add support for matching against revision field
The standard SCSI inquiry data provides for a field 'revision' whic specifies the software revision of the device. Some vendors changed the behaviour during software releases so it's desireable that we can match on that field in the hardware table, too.
Signed-off-by Hannes Reinecke <[email protected]>
---
libmultipath/config.c | 40 ++++++++++++++++++++++++++++++---------- libmultipath/config.h | 3 ++- libmultipath/discovery.c | 4 ++-- 3 files changed, 34 insertions(+), 13 deletions(-)
c40e7e72592eca6ed54e6aee5861fcfbee059f2f
libmultipath/config.c +30 -10
@@ -21,7 +21,7 @@ #include "blacklist.h"#include "defaults.h" static struct hwentry * -find_hwe_strmatch (vector hwtable,char * vendor,char * product) +find_hwe_strmatch (vector hwtable,char * vendor,char * product,char * revision) {int i;struct hwentry *hwe, *ret =NULL ;
@@ -33,6 +33,9 @@ find_hwe_strmatch (vector hwtable, charif (hwe->product && product &&strcmp (hwe->product, product))continue ; +if (hwe->revision && revision &&strcmp (hwe->revision, revision)) +continue ; + ret = hwe;break ; }
@@ -40,11 +43,11 @@ find_hwe_strmatch (vector hwtable, char }struct hwentry * -find_hwe (vector hwtable,char * vendor,char * product) +find_hwe (vector hwtable,char * vendor,char * product,char * revision) {int i;struct hwentry *hwe, *ret =NULL ; -regex_t vre, pre; +regex_t vre, pre, rre; vector_foreach_slot (hwtable, hwe, i) { if (hwe->vendor &&
@@ -55,12 +58,23 @@ find_hwe (vector hwtable, char * vendor,regfree (&vre);break ; } +if (hwe->revision && +regcomp (&rre, hwe->revision,REG_EXTENDED |REG_NOSUB )) { +regfree (&vre); +regfree (&pre); +break ; + }if ((!hwe->vendor || !regexec (&vre, vendor,0 ,NULL ,0 )) && - (!hwe->product || !regexec (&pre, product,0 ,NULL ,0 ))) + (!hwe->product || !regexec (&pre, product,0 ,NULL ,0 )) && + (!hwe->revision || !regexec (&rre, revision,0 ,NULL ,0 ))) ret = hwe; - -regfree (&pre); -regfree (&vre); + +if (hwe->revision) +regfree (&rre); +if (hwe->product) +regfree (&pre); +if (hwe->vendor) +regfree (&vre);if (ret)break ;
@@ -112,6 +126,9 @@ free_hwe (struct hwentry * hwe)if (hwe->product)FREE (hwe->product); +if (hwe->revision) +FREE (hwe->revision); +if (hwe->selector)FREE (hwe->selector);
@@ -226,9 +243,9 @@ set_param_str(char * str) }static int -dup_hwe (vector hwtable,char * vendor,char * product) +dup_hwe (vector hwtable,char * vendor,char * product,char * revision) { -struct hwentry * hwe =find_hwe (hwtable, vendor, product); +struct hwentry * hwe =find_hwe (hwtable, vendor, product, revision);if (hwe)return 1 ;
@@ -241,7 +258,7 @@ store_hwe (vector hwtable, struct hwentr {struct hwentry * hwe; -if (find_hwe_strmatch (hwtable, dhwe->vendor, dhwe->product)) +if (find_hwe_strmatch (hwtable, dhwe->vendor, dhwe->product, dhwe->revision))return 0 ;if (!(hwe =alloc_hwe ()))
@@ -253,6 +270,9 @@ store_hwe (vector hwtable, struct hwentrif (!dhwe->product || !(hwe->product =set_param_str (dhwe->product))) goto out; +if (dhwe->revision && !(hwe->revision =set_param_str (dhwe->revision))) + goto out; +if (dhwe->getuid && !(hwe->getuid =set_param_str (dhwe->getuid))) goto out;
libmultipath/config.h +2 -1
@@ -11,6 +11,7 @@ enum devtypes {struct hwentry {char * vendor;char * product; +char * revision;char * getuid;char * getprio;char * features;
@@ -78,7 +79,7 @@ struct config {struct config * conf; -struct hwentry *find_hwe (vector hwtable,char * vendor,char * product); +struct hwentry *find_hwe (vector hwtable,char * vendor,char * product,char *revision);struct mpentry *find_mpe (char * wwid);char *get_mpe_wwid (char * alias);
libmultipath/discovery.c +2 -2
@@ -442,7 +442,7 @@ scsi_sysfs_pathinfo (struct path * pp)/* * set the hwe configlet pointer */ - pp->hwe =find_hwe (conf->hwtable, pp->vendor_id, pp->product_id); + pp->hwe =find_hwe (conf->hwtable, pp->vendor_id, pp->product_id, pp->rev);/* * host / bus / target / lun
@@ -526,7 +526,7 @@ ccw_sysfs_pathinfo (struct path * pp)/* * set the hwe configlet pointer */ - pp->hwe =find_hwe (conf->hwtable, pp->vendor_id, pp->product_id); + pp->hwe =find_hwe (conf->hwtable, pp->vendor_id, pp->product_id,NULL );/* * host / bus / target / lun
Signature · 1 line
1.3.1