fabrics: drop --quiet alias -S

-S has been allocated for the global dhchap secret option. It's likely that the --quiet option is less used, thus drop the -S alias for it. Fixes: 0571307 ("nvme-connect: Add 'dhchap-secret' and 'dhchap-ctrl-secret' arguments") Signed-off-by: Daniel Wagner <[email protected]>
linux-nvme · Aug 1, 2024 · 72f9604 · 72f9604
1 parent 9aaa137
commit 72f9604
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/Documentation/nvme-connect-all.txt b/Documentation/nvme-connect-all.txt
@@ -27,7 +27,7 @@ SYNOPSIS
 			[--nr-poll-queues=<#> | -P <#>]
 			[--queue-size=<#> | -Q <#>] [--keyring=<#>]
 			[--tls_key=<#>] [--hdr-digest | -g] [--data-digest | -G]
-			[--persistent | -p] [--tls] [--concat] [--quiet | -S]
+			[--persistent | -p] [--tls] [--concat] [--quiet]
 			[--dump-config | -O] [--nbft] [--no-nbft]
 			[--nbft-path=<STR>] [--context=<STR>]
 			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
@@ -189,7 +189,6 @@ OPTIONS
 --concat::
 	Enable secure concatenation (TCP).
 
--S::
 --quiet::
 	Suppress error messages.
 

diff --git a/Documentation/nvme-discover.txt b/Documentation/nvme-discover.txt
@@ -27,7 +27,7 @@ SYNOPSIS
 			[--nr-poll-queues=<#> | -P <#>]
 			[--queue-size=<#> | -Q <#>] [--keyring=<#>]
 			[--tls_key=<#>] [--hdr-digest | -g] [--data-digest | -G]
-			[--persistent | -p] [--quiet | -S] [--tls] [--concat]
+			[--persistent | -p] [--quiet] [--tls] [--concat]
 			[--dump-config | -O] [--output-format=<fmt> | -o <fmt>]
 			[--force] [--nbft] [--no-nbft] [--nbft-path=<STR>]
 			[--context=<STR>]
@@ -209,7 +209,6 @@ OPTIONS
 --concat::
 	Enable secure concatenation (TCP).
 
--S::
 --quiet::
 	Suppress already connected errors.
 

diff --git a/completions/_nvme b/completions/_nvme
@@ -2032,7 +2032,6 @@ _nvme () {
 			--persistent':'
 			-p':alias for --'
 			--quiet':'
-			-S':alias for --'
 			--config=':Use specified JSON configuration file or none to disable'
 			-J':alias for --config'
 			--verbose':Increase logging verbosity'
@@ -2103,7 +2102,6 @@ _nvme () {
 			--persistent':'
 			-p':alias for --'
 			--quiet':'
-			-S':alias for --'
 			--config=':Use specified JSON configuration file or none to disable'
 			-J':alias for --config'
 			--verbose':Increase logging verbosity'

diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
@@ -388,7 +388,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 \
+			--persistent -p --quiet \
 			--output-format= -o"
 			;;
 		"connect-all")
@@ -400,7 +400,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 \
+			--persistent -p --quiet \
 			--output-format= -o"
 			;;
 		"connect")

diff --git a/fabrics.c b/fabrics.c
@@ -421,7 +421,7 @@ static int discover_from_conf_file(nvme_root_t r, nvme_host_t h,
 		  OPT_FMT("output-format", 'o', &format,     output_format),
 		  OPT_FILE("raw",          'r', &raw,        "save raw output to file"),
 		  OPT_FLAG("persistent",   'p', &persistent, "persistent discovery connection"),
-		  OPT_FLAG("quiet",        'S', &quiet,      "suppress already connected errors"),
+		  OPT_FLAG("quiet",          0, &quiet,      "suppress already connected errors"),
 		  OPT_INCR("verbose",      'v', &verbose,    "Increase logging verbosity"),
 		  OPT_FLAG("force",          0, &force,      "Force persistent discovery controller creation"));
 
@@ -704,7 +704,7 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
 		  OPT_FMT("output-format", 'o', &format,              output_format),
 		  OPT_FILE("raw",          'r', &raw,                 "save raw output to file"),
 		  OPT_FLAG("persistent",   'p', &persistent,          "persistent discovery connection"),
-		  OPT_FLAG("quiet",        'S', &quiet,               "suppress already connected errors"),
+		  OPT_FLAG("quiet",          0, &quiet,               "suppress already connected errors"),
 		  OPT_STRING("config",     'J', "FILE", &config_file, nvmf_config_file),
 		  OPT_INCR("verbose",      'v', &verbose,             "Increase logging verbosity"),
 		  OPT_FLAG("dump-config",  'O', &dump_config,         "Dump configuration file to stdout"),