<div dir="ltr">Merged.<div>Thanks.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jun 23, 2017 at 11:13 PM, Xose Vazquez Perez <span dir="ltr"><<a href="mailto:xose.vazquez@gmail.com" target="_blank">xose.vazquez@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">and the 'MD Series' comment to the right place.<br>
<br>
Cc: Christophe Varoqui <<a href="mailto:christophe.varoqui@opensvc.com">christophe.varoqui@opensvc.<wbr>com</a>><br>
Cc: device-mapper development <<a href="mailto:dm-devel@redhat.com">dm-devel@redhat.com</a>><br>
Signed-off-by: Xose Vazquez Perez <<a href="mailto:xose.vazquez@gmail.com">xose.vazquez@gmail.com</a>><br>
---<br>
libmultipath/hwtable.c | 98 +++++++++++++++++++++++++-----<wbr>--------------------<br>
1 file changed, 50 insertions(+), 48 deletions(-)<br>
<br>
diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c<br>
index 390d143..a77da7e 100644<br>
--- a/libmultipath/hwtable.c<br>
+++ b/libmultipath/hwtable.c<br>
@@ -26,6 +26,55 @@<br>
* Moreover, if a device needs a special treatment by the SCSI<br>
* subsystem it should be included in drivers/scsi/scsi_devinfo.c<br>
*/<br>
+<br>
+#if 0<br>
+ /*<br>
+ * Copy this TEMPLATE to add new hardware.<br>
+ *<br>
+ * Keep only mandatory(.vendor and .product) and modified attributes.<br>
+ * Attributes with default values must be removed.<br>
+ * .vendor, .product, .revision and .bl_product are POSIX Extended regex.<br>
+ *<br>
+ * COMPANY_NAME<br>
+ *<br>
+ * Maintainer : XXX<br>
+ * Mail : XXX<br>
+ */<br>
+ {<br>
+ /* If product-ID is different from marketing name add a comment */<br>
+ .vendor = "VENDOR",<br>
+ .product = "PRODUCT",<br>
+ .revision = "REVISION",<br>
+ .bl_product = "BL_PRODUCT",<br>
+ .pgpolicy = FAILOVER,<br>
+ .uid_attribute = "ID_SERIAL",<br>
+ .selector = "service-time 0",<br>
+ .checker_name = TUR,<br>
+ .alias_prefix = "mpath",<br>
+ .features = "0",<br>
+ .hwhandler = "0",<br>
+ .prio_name = PRIO_CONST,<br>
+ .prio_args = "",<br>
+ .pgfailback = -FAILBACK_MANUAL,<br>
+ .rr_weight = RR_WEIGHT_NONE,<br>
+ .no_path_retry = NO_PATH_RETRY_UNDEF,<br>
+ .minio = 1000,<br>
+ .minio_rq = 1,<br>
+ .flush_on_last_del = FLUSH_DISABLED,<br>
+ .user_friendly_names = USER_FRIENDLY_NAMES_OFF,<br>
+ .fast_io_fail = 5,<br>
+ .dev_loss = 600,<br>
+ .retain_hwhandler = RETAIN_HWHANDLER_ON,<br>
+ .detect_prio = DETECT_PRIO_ON,<br>
+ .detect_checker = DETECT_CHECKER_ON,<br>
+ .deferred_remove = DEFERRED_REMOVE_OFF,<br>
+ .delay_watch_checks = DELAY_CHECKS_OFF,<br>
+ .delay_wait_checks = DELAY_CHECKS_OFF,<br>
+ .skip_kpartx = SKIP_KPARTX_OFF,<br>
+ .max_sectors_kb = MAX_SECTORS_KB_UNDEF,<br>
+ },<br>
+#endif<br>
+<br>
static struct hwentry default_hw[] = {<br>
/*<br>
* Apple<br>
@@ -224,8 +273,8 @@ static struct hwentry default_hw[] = {<br>
.pgpolicy = MULTIBUS,<br>
.no_path_retry = NO_PATH_RETRY_QUEUE,<br>
},<br>
- /* MD Series */<br>
{<br>
+ /* MD Series */<br>
.vendor = "DELL",<br>
.product = "^MD3",<br>
.bl_product = "Universal Xport",<br>
@@ -1059,53 +1108,6 @@ static struct hwentry default_hw[] = {<br>
.checker_name = DIRECTIO,<br>
.retain_hwhandler = RETAIN_HWHANDLER_OFF,<br>
},<br>
-#if 0<br>
- /*<br>
- * Copy this TEMPLATE to add new hardware.<br>
- *<br>
- * Keep only mandatory(.vendor and .product) and modified attributes.<br>
- * Attributes with default values must be removed.<br>
- * .vendor, .product, .revision and .bl_product are POSIX Extended regex.<br>
- *<br>
- * COMPANY_NAME<br>
- *<br>
- * Maintainer : XXX<br>
- * Mail : XXX<br>
- */<br>
- {<br>
- /* If product-ID is different from marketing name add a comment */<br>
- .vendor = "VENDOR",<br>
- .product = "PRODUCT",<br>
- .revision = "REVISION",<br>
- .bl_product = "BL_PRODUCT",<br>
- .pgpolicy = FAILOVER,<br>
- .uid_attribute = "ID_SERIAL",<br>
- .selector = "service-time 0",<br>
- .checker_name = TUR,<br>
- .alias_prefix = "mpath",<br>
- .features = "0",<br>
- .hwhandler = "0",<br>
- .prio_name = PRIO_CONST,<br>
- .prio_args = "",<br>
- .pgfailback = -FAILBACK_MANUAL,<br>
- .rr_weight = RR_WEIGHT_NONE,<br>
- .no_path_retry = NO_PATH_RETRY_UNDEF,<br>
- .minio = 1000,<br>
- .minio_rq = 1,<br>
- .flush_on_last_del = FLUSH_DISABLED,<br>
- .user_friendly_names = USER_FRIENDLY_NAMES_OFF,<br>
- .fast_io_fail = 5,<br>
- .dev_loss = 600,<br>
- .retain_hwhandler = RETAIN_HWHANDLER_ON,<br>
- .detect_prio = DETECT_PRIO_ON,<br>
- .detect_checker = DETECT_CHECKER_ON,<br>
- .deferred_remove = DEFERRED_REMOVE_OFF,<br>
- .delay_watch_checks = DELAY_CHECKS_OFF,<br>
- .delay_wait_checks = DELAY_CHECKS_OFF,<br>
- .skip_kpartx = SKIP_KPARTX_OFF,<br>
- .max_sectors_kb = MAX_SECTORS_KB_UNDEF,<br>
- },<br>
-#endif<br>
/*<br>
* EOL<br>
*/<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.13.1<br>
</font></span></blockquote></div><br></div>