[ovs-dev] [PATCH v3 0/4] Use more sensitive terminology.

Ben Pfaff blp at ovn.org
Tue Jul 7 16:25:25 UTC 2020


There's no value in risking turning people away from OVS due to
insensitive terminology choices.  We can do better.

v1->v2: Rebase.
v2->v3: Fix some new instances of "slave" that had crept in (thanks
  Ilya!).  Drop a patch that I had accidentally appended in v2.

Ben Pfaff (4):
  Eliminate use of term "slave" in bond, LACP, and bundle contexts.
  Use primary/secondary, not master/slave, as names for OpenFlow roles.
  conntrack: Rename "master" connection to "primary" connection.
  Eliminate "whitelist" and "blacklist" terms.

 Documentation/howto/ipsec.rst                 |   2 +-
 Documentation/howto/selinux.rst               |   8 +-
 Documentation/topics/bonding.rst              | 177 ++--
 Documentation/topics/datapath.rst             |   2 +-
 Documentation/topics/design.rst               | 110 +--
 Documentation/topics/ovsdb-replication.rst    |   9 +-
 Documentation/topics/porting.rst              |   4 +-
 Makefile.am                                   |  10 +-
 NEWS                                          |   7 +-
 build-aux/automake.mk                         |   2 +-
 ...ab-whitelist => initial-tab-allowed-files} |   0
 ...fety-blacklist => thread-safety-forbidden} |   0
 datapath/Makefile.am                          |   2 +-
 datapath/linux/Modules.mk                     |   2 +-
 ...heck-whitelist => export-check-allow-list} |   0
 debian/changelog                              |   2 +-
 debian/ifupdown.sh                            |   4 +-
 include/openflow/nicira-ext.h                 |  22 +-
 include/openflow/openflow-1.2.h               |   6 +-
 include/openflow/openflow-1.4.h               |   8 +-
 include/openvswitch/automake.mk               |   2 +-
 include/openvswitch/meta-flow.h               |  14 +-
 include/openvswitch/ofp-actions.h             |  28 +-
 include/openvswitch/ofp-connection.h          |   6 +-
 include/openvswitch/ofp-errors.h              |   9 +-
 lib/bundle.c                                  | 100 +--
 lib/bundle.h                                  |   4 +-
 lib/cfm.c                                     |   2 +-
 lib/conntrack-private.h                       |  10 +-
 lib/conntrack.c                               |  74 +-
 lib/ct-dpif.c                                 |   6 +-
 lib/ct-dpif.h                                 |   2 +-
 lib/daemon.man                                |   2 +-
 lib/daemon.xml                                |   2 +-
 lib/dpif-netdev.c                             |  40 +-
 lib/dpif-provider.h                           |   4 +-
 lib/dpif.c                                    |  18 +-
 lib/dpif.h                                    |   4 +-
 lib/lacp.c                                    | 542 ++++++------
 lib/lacp.h                                    |  23 +-
 lib/lldp/lldp-const.h                         |  16 +-
 lib/lldp/lldpd-structs.h                      |  10 +-
 lib/mac-learning.c                            |  17 +-
 lib/mac-learning.h                            |   2 +-
 lib/meta-flow.xml                             |   2 +-
 lib/netdev-linux.c                            |  22 +-
 lib/netlink-conntrack.c                       |   6 +-
 lib/ofp-actions.c                             |  84 +-
 lib/ofp-connection.c                          |  94 ++-
 lib/ovs-actions.xml                           |  35 +-
 lib/ovsdb-idl.h                               |   4 +-
 lib/rtnetlink.c                               |  16 +-
 lib/rtnetlink.h                               |   6 +-
 lib/unixctl.c                                 |   6 +-
 manpages.mk                                   |   3 -
 ofproto/bond.c                                | 786 +++++++++---------
 ofproto/bond.h                                |  28 +-
 ofproto/connmgr.c                             |  72 +-
 ofproto/connmgr.h                             |   4 +-
 ofproto/ofproto-dpif-rid.h                    |   4 +-
 ofproto/ofproto-dpif-sflow.c                  |   2 +-
 ofproto/ofproto-dpif-xlate.c                  |  23 +-
 ofproto/ofproto-dpif.c                        |  45 +-
 ofproto/ofproto-dpif.h                        |   2 +-
 ofproto/ofproto-provider.h                    |  12 +-
 ofproto/ofproto.c                             |  42 +-
 ofproto/ofproto.h                             |  10 +-
 ovsdb/ovsdb-server.c                          |   8 +-
 ovsdb/replication.c                           |  72 +-
 ovsdb/replication.h                           |  10 +-
 tests/bundle.at                               |  48 +-
 tests/lacp.at                                 | 130 +--
 tests/ofp-actions.at                          |  28 +-
 tests/ofp-print.at                            |  49 +-
 tests/ofproto-dpif.at                         |  24 +-
 tests/ofproto-macros.at                       |   4 +-
 tests/ofproto.at                              | 138 +--
 tests/ovs-ofctl.at                            |  56 +-
 tests/system-kmod-macros.at                   |   6 +-
 tests/system-traffic.at                       |   6 +-
 tests/system-userspace-macros.at              |   6 +-
 tests/test-bundle.c                           | 112 +--
 tests/test-classifier.c                       |   3 +-
 utilities/checkpatch.py                       |   8 +-
 utilities/ovs-ofctl.8.in                      |   8 +-
 vswitchd/bridge.c                             |  69 +-
 vswitchd/ovs-vswitchd.8.in                    |  42 +-
 vswitchd/ovs-vswitchd.c                       |   2 +-
 vswitchd/vswitch.xml                          |  62 +-
 89 files changed, 1776 insertions(+), 1737 deletions(-)
 rename build-aux/{initial-tab-whitelist => initial-tab-allowed-files} (100%)
 rename build-aux/{thread-safety-blacklist => thread-safety-forbidden} (100%)
 rename datapath/linux/compat/build-aux/{export-check-whitelist => export-check-allow-list} (100%)

-- 
2.26.2



More information about the dev mailing list