Message ID | 1531510755-16046-2-git-send-email-bmarzins@redhat.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Delegated to: | christophe varoqui |
Headers | show |
On Fri, 2018-07-13 at 14:39 -0500, Benjamin Marzinski wrote: > My previous patch to remove the rbd code missed a little bit. > > Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> > --- > kpartx/del-part-nodes.rules | 2 +- > libmultipath/structs.h | 1 - > 2 files changed, 1 insertion(+), 2 deletions(-) > Reviewed-by: Martin Wilck <mwilck@suse.com> > 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, > }; >
On Fri, 2018-07-13 at 14:39 -0500, Benjamin Marzinski wrote: > My previous patch to remove the rbd code missed a little bit. > > Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> > --- > kpartx/del-part-nodes.rules | 2 +- > libmultipath/structs.h | 1 - > 2 files changed, 1 insertion(+), 2 deletions(-) > Reviewed-by: Martin Wilck <mwilck@suse.com> > 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, > }; >
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, };
My previous patch to remove the rbd code missed a little bit. Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> --- kpartx/del-part-nodes.rules | 2 +- libmultipath/structs.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)