From patchwork Mon Oct 3 15:53:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xose Vazquez Perez X-Patchwork-Id: 9360671 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AE7EB6075E for ; Mon, 3 Oct 2016 15:56:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E92C28674 for ; Mon, 3 Oct 2016 15:56:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9341C2888B; Mon, 3 Oct 2016 15:56:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 13B7128674 for ; Mon, 3 Oct 2016 15:56:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u93FrSGm004667; Mon, 3 Oct 2016 11:53:29 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u93FrRT8019122 for ; Mon, 3 Oct 2016 11:53:27 -0400 Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u93FrRa5016427 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 3 Oct 2016 11:53:27 -0400 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 05E0EC056790 for ; Mon, 3 Oct 2016 15:53:25 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id b184so15358782wma.3 for ; Mon, 03 Oct 2016 08:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=a1bF1tvRWX81z1RYstVWpItu4aNClnWLH73ROeCkXwE=; b=APRT1Sg8QmACyMsO3LQxGZTwLjeyXDJHbJ1zaktqU+lbhYsc3X8Rz+vM1xNaEHVxOz mYBGsZWi7NtXno43iQ5rlwpsyQzU6RT0pCWqCxm1cC1bPcoJttNeFdyAkLdJBK5UcANU 6Vl24GgVctavrPzIyx02OLLomNkeiOE9GtvhQ93LmrtmObbEDHwAIyU+esqXnBqeupGS SBrtIAqdzoT4RUiNIT3/oPV0dA3t6jVavnn8CCZr61wY4VK+Lb5PKEasG751Jcd0/D47 Aw4IUEkqbTEw1OmCnvyRSPY0l0mwSfo6Ial/zez3K0br8W/pbO33FKou6nKKoeTUVebv f5hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=a1bF1tvRWX81z1RYstVWpItu4aNClnWLH73ROeCkXwE=; b=Fpm3N0H9eCGef++RoJQuo2pWnonf/UIOlXsS5vM0NczsbXvu5AU96w9VbZpH3d3E3w uHs2pa+j6+dHmOCm4Mz6gXtAoR7S1i50zJzSJoW9g8VcGjuYcWIanQh18o4rztDwTx1Z 76sWMG8RUYk3sBkQAXCmPX6R75L6HQBt5LUdhnxd4EknkQn3tHrpT4lXp2whF/+uSQpy UAd+sPNyMkG5Ob44cDyeukwuVskk1cZEVebTZenEcVOtk4rRYQJ3xfTXK7bexuAjeux/ 2OGneBEGrZqi2ile6vDQFznQMcVhgx7s6NY03itSbJdB3ZBSJqayecIlnBTnRZCGjdGG HMvw== X-Gm-Message-State: AA6/9Rmi+FyugCpm3C0zmYF9UXQ8bCk7VSLuj2xFIcRoiztuutIYFuzK4f5QtCgxBf0/jg== X-Received: by 10.194.88.137 with SMTP id bg9mr17067421wjb.155.1475510003722; Mon, 03 Oct 2016 08:53:23 -0700 (PDT) Received: from localhost ([37.29.165.80]) by smtp.gmail.com with ESMTPSA id b65sm8107718wmg.18.2016.10.03.08.53.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Oct 2016 08:53:22 -0700 (PDT) From: Xose Vazquez Perez To: Date: Mon, 3 Oct 2016 17:53:20 +0200 Message-Id: <20161003155320.17792-1-xose.vazquez@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 03 Oct 2016 15:53:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 03 Oct 2016 15:53:25 +0000 (UTC) for IP:'74.125.82.67' DOMAIN:'mail-wm0-f67.google.com' HELO:'mail-wm0-f67.google.com' FROM:'xose.vazquez@gmail.com' RCPT:'' X-RedHat-Spam-Score: 1.17 * (BAYES_50, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, SPF_PASS) 74.125.82.67 mail-wm0-f67.google.com 74.125.82.67 mail-wm0-f67.google.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-loop: dm-devel@redhat.com Cc: device-mapper development , Xose Vazquez Perez Subject: [dm-devel] [PATCH] multipath-tools: remove pointless ".*" from devnode blacklists X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Virus-Scanned: ClamAV using ClamSMTP ".*" is useless at the end of a regex, and just "*" is a bug. And document them. Cc: Christophe Varoqui Cc: device-mapper development Signed-off-by: Xose Vazquez Perez --- libmultipath/blacklist.c | 8 ++++---- multipath/multipath.conf.5 | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c index 9687399..aa8d975 100644 --- a/libmultipath/blacklist.c +++ b/libmultipath/blacklist.c @@ -172,7 +172,7 @@ setup_default_blist (struct config * conf) char * str; int i; - str = STRDUP("^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"); + str = STRDUP("^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]"); if (!str) return 1; if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) @@ -184,19 +184,19 @@ setup_default_blist (struct config * conf) if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) return 1; - str = STRDUP("^dcssblk[0-9]*"); + str = STRDUP("^dcssblk[0-9]"); if (!str) return 1; if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) return 1; - str = STRDUP("^nvme.*"); + str = STRDUP("^nvme"); if (!str) return 1; if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) return 1; - str = STRDUP("(SCSI_IDENT_.*|ID_WWN)"); + str = STRDUP("(SCSI_IDENT_|ID_WWN)"); if (!str) return 1; if (store_ble(conf->elist_property, str, ORIGIN_DEFAULT)) diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5 index 7dd997a..7bb847a 100644 --- a/multipath/multipath.conf.5 +++ b/multipath/multipath.conf.5 @@ -849,6 +849,10 @@ The following keywords are recognized: .TP 17 .B devnode Regular expression of the device nodes to be excluded. +.RS +.TP +Default value is: \fB^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]\fR, \fB^(td|hd|vd)[a-z]\fR, \fB^dcssblk[0-9]\fR and \fB^nvme\fR +.RE .TP .B wwid The \fIWorld Wide Identification\fR of a device. @@ -888,7 +892,7 @@ The \fIWorld Wide Identification\fR of a device. Regular expression of the udev property to be whitelisted. .RS .TP -Default value is: \fB(ID_WWN|SCSI_IDENT_.*)\fR +Default value is: \fB(SCSI_IDENT_|ID_WWN)\fR .RE .TP .B device