nvmf: Remove --matching from systemd service file

'--matching' is not a great concept. The whole point of a discovery
log is to return different port addresses from the one we're using.

Thus the '--matching' logic was dropped when switching over the
libnvme but we forgot to remove it from the systemd service file.

Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/Documentation/nvme-connect-all.txt b/Documentation/nvme-connect-all.txt
index 3d3587ffcb39b85b40ded0276c932e7b708e4edd..7ab8d35ade70a94b038ee09c51ea934fbef25ed9 100644 (file)
--- a/Documentation/nvme-connect-all.txt
+++ b/Documentation/nvme-connect-all.txt
@@ -28,7 +28,6 @@ SYNOPSIS
                [--nr-write-queues=<#>    | -W <#>]
                [--nr-poll-queues=<#>     | -P <#>]
                [--queue-size=<#>         | -Q <#>]
-               [--matching               | -m]
                [--persistent             | -p]
                [--quiet                  | -S]
                [--dump-config            | -O]
@@ -166,12 +165,6 @@ OPTIONS
        by the driver. This option will be ignored for discovery, but will be
        passed on to the subsequent connect call.
 
--m::
---matching::
-       If a traddr was specified on the command line or in the configuration
-       file, only create controllers for discovery records that match the
-       given traddr, rather than for all entries in the discovery log page.
-
 -p::
 --persistent::
        Don't remove the discovery controller after retrieving the discovery

diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
index 10cbdd1edaf67a2c4ce2bb6c535e23152ddf10d6..f9762d578d2f71fba2d4a590902af47de1351604 100644 (file)
--- a/completions/bash-nvme-completion.sh
+++ b/completions/bash-nvme-completion.sh
@@ -459,7 +459,7 @@ nvme_list_opts () {
                        --tos= -T --hdr-digest= -g --data-digest -G \
                        --nr-io-queues= -i --nr-write-queues= -W \
                        --nr-poll-queues= -P --queue-size= -Q \
-                       --persistent -p --quiet -S --matching -m \
+                       --persistent -p --quiet -S \
                        --output-format= -o"
                        ;;
                "connect-all")
@@ -471,7 +471,7 @@ nvme_list_opts () {
                        --tos= -T --hdr-digest= -g --data-digest -G \
                        --nr-io-queues= -i --nr-write-queues= -W \
                        --nr-poll-queues= -P --queue-size= -Q \
-                       --persistent -p --quiet -S --matching -m \
+                       --persistent -p --quiet -S \
                        --output-format= -o"
                        ;;
                "connect")

diff --git a/nvmf-autoconnect/systemd/nvmf-connect@.service b/nvmf-autoconnect/systemd/nvmf-connect@.service
index 5fbf081731d7d262ee38a96932e1dbef04e5e9d0..c60f146e990c1046bcc31a95d294a0c7c257e83f 100644 (file)
--- a/nvmf-autoconnect/systemd/nvmf-connect@.service
+++ b/nvmf-autoconnect/systemd/nvmf-connect@.service
@@ -11,4 +11,4 @@ Requires=nvmf-connect.target
 [Service]
 Type=simple
 Environment="CONNECT_ARGS=%i"
-ExecStart=/bin/sh -c "nvme connect-all --matching --quiet `/bin/echo -e '${CONNECT_ARGS}'`"
+ExecStart=/bin/sh -c "nvme connect-all --quiet `/bin/echo -e '${CONNECT_ARGS}'`"