From: Daniel Wagner <dwagner@suse.de>
Date: Tue, 8 Feb 2022 14:27:33 +0000 (+0100)
Subject: nvmf: Remove --matching from systemd service file
X-Git-Tag: v2.0-rc3~11^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c362c924a268de2bb6a072015f5138b9689698d5;p=users%2Fsagi%2Fnvme-cli.git

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 3d3587ff..7ab8d35a 100644
--- 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 10cbdd1e..f9762d57 100644
--- 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 5fbf0817..c60f146e 100644
--- 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}'`"