From patchwork Wed Aug 1 20:56:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 10552959 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-2.web.codeaurora.org (Postfix) with ESMTP id 2150F15E2 for ; Wed, 1 Aug 2018 20:57:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1387B2B7BB for ; Wed, 1 Aug 2018 20:57:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 073872B8E3; Wed, 1 Aug 2018 20:57:30 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AF5842B7BB for ; Wed, 1 Aug 2018 20:57:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A9CDC3082132; Wed, 1 Aug 2018 20:57:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2061B600C4; Wed, 1 Aug 2018 20:57:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BCD694A460; Wed, 1 Aug 2018 20:57:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w71KvNK3027928 for ; Wed, 1 Aug 2018 16:57:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7791110EE6DE; Wed, 1 Aug 2018 20:57:23 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with SMTP id 4710710EE6DD; Wed, 1 Aug 2018 20:57:20 +0000 (UTC) Received: by redhat.com (sSMTP sendmail emulation); Wed, 01 Aug 2018 15:57:20 -0500 From: "Benjamin Marzinski" To: device-mapper development Date: Wed, 1 Aug 2018 15:56:47 -0500 Message-Id: <1533157038-3924-2-git-send-email-bmarzins@redhat.com> In-Reply-To: <1533157038-3924-1-git-send-email-bmarzins@redhat.com> References: <1533157038-3924-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: dm-devel@redhat.com Cc: Martin Wilck Subject: [dm-devel] [PATCH 01/32] libmultipath: remove last of rbd code 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-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 01 Aug 2018 20:57:29 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP My previous patch to remove the rbd code missed a little bit. Reviewed-by: Martin Wilck Signed-off-by: Benjamin Marzinski --- kpartx/del-part-nodes.rules | 2 +- libmultipath/structs.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/kpartx/del-part-nodes.rules b/kpartx/del-part-nodes.rules index 17bc505..0ceecf5 100644 --- a/kpartx/del-part-nodes.rules +++ b/kpartx/del-part-nodes.rules @@ -10,7 +10,7 @@ # or create an udev rule file that sets ENV{DONT_DEL_PART_NODES}="1". SUBSYSTEM!="block", GOTO="end_del_part_nodes" -KERNEL!="sd*|dasd*|rbd*", GOTO="end_del_part_nodes" +KERNEL!="sd*|dasd*", GOTO="end_del_part_nodes" ACTION!="add|change", GOTO="end_del_part_nodes" ENV{DEVTYPE}=="partition", GOTO="end_del_part_nodes" diff --git a/libmultipath/structs.h b/libmultipath/structs.h index e5b698b..ca14315 100644 --- a/libmultipath/structs.h +++ b/libmultipath/structs.h @@ -61,7 +61,6 @@ enum sysfs_buses { SYSFS_BUS_IDE, SYSFS_BUS_CCW, SYSFS_BUS_CCISS, - SYSFS_BUS_RBD, SYSFS_BUS_NVME, };