fabrics: drop --disable-sqflow alias -d

The alias for --disable-sqflow -d clashes with --device for the
discover command. Since the --disable-sqflow is not so commonly used,
let's free -d for other uses.

Fixes: 18de3a6d61a7 ("Convert to libnvme")
Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/Documentation/nvme-config.txt b/Documentation/nvme-config.txt
index 8a666447546909c4242af39cd1c05ba27cdf32e0..98009e4d8ece6b318dcb16001021edbb4cbe3842 100644 (file)
--- a/Documentation/nvme-config.txt
+++ b/Documentation/nvme-config.txt
@@ -27,7 +27,7 @@ SYNOPSIS
                        [--keep-alive-tmo=<#> | -k <#>]
                        [--reconnect-delay=<#> | -c <#>]
                        [--ctrl-loss-tmo=<#> | -l <#>]
-                       [--duplicate-connect | -D] [--disable-sqflow | -d]
+                       [--duplicate-connect | -D] [--disable-sqflow ]
                        [--hdr-digest | -g] [--data-digest | -G]
                        [--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
@@ -168,7 +168,6 @@ OPTIONS
        Allows duplicated connections between same transport host and subsystem
        port.
 
--d::
 --disable-sqflow::
        Disables SQ flow control to omit head doorbell update for submission
        queues when sending nvme completions.

diff --git a/Documentation/nvme-connect.txt b/Documentation/nvme-connect.txt
index 72b80007e98628fa906bfedbdb6d520632e23857..0112e110be5d833deadfae00eb99544c034d9c9e 100644 (file)
--- a/Documentation/nvme-connect.txt
+++ b/Documentation/nvme-connect.txt
@@ -27,7 +27,7 @@ SYNOPSIS
                        [--reconnect-delay=<#> | -c <#>]
                        [--ctrl-loss-tmo=<#> | -l <#>] [--tos=<#> | -T <#>]
                        [--keyring=<#>] [--tls_key=<#>]
-                       [--duplicate-connect | -D] [--disable-sqflow | -d]
+                       [--duplicate-connect | -D] [--disable-sqflow ]
                        [--hdr-digest | -g] [--data-digest | -G] [--tls]
                        [--concat] [--dump-config | -O] [--application=<id>]
                        [--output-format=<fmt> | -o <fmt>] [--verbose | -v]
@@ -162,7 +162,6 @@ OPTIONS
        Allows duplicated connections between same transport host and subsystem
        port.
 
--d::
 --disable-sqflow::
        Disables SQ flow control to omit head doorbell update for submission
        queues when sending nvme completions.

diff --git a/completions/_nvme b/completions/_nvme
index 70ab9d3e89e6b98b2d86e49ef0a44c403b181957..0d3ce93c2832667bfe00a1ff0c29651fe60dbb52 100644 (file)
--- a/completions/_nvme
+++ b/completions/_nvme
@@ -2020,7 +2020,6 @@ _nvme () {
                        --duplicate-connect':allow duplicate connections between same transport host and subsystem port'
                        -D':alias for --duplicate-connect'
                        --disable-sqflow':disable controller sq flow control (default false)'
-                       -d':alias for --disable-sqflow'
                        --hdr-digest':enable transport protocol header digest (TCP transport)'
                        -g':alias for --hdr-digest'
                        --data-digest':enable transport protocol data digest (TCP transport)'
@@ -2092,7 +2091,6 @@ _nvme () {
                        --duplicate-connect':allow duplicate connections between same transport host and subsystem port'
                        -D':alias for --duplicate-connect'
                        --disable-sqflow':disable controller sq flow control (default false)'
-                       -d':alias for --disable-sqflow'
                        --hdr-digest':enable transport protocol header digest (TCP transport)'
                        -g':alias for --hdr-digest'
                        --data-digest':enable transport protocol data digest (TCP transport)'
@@ -2162,7 +2160,6 @@ _nvme () {
                        --duplicate-connect':allow duplicate connections between same transport host and subsystem port'
                        -D':alias for --duplicate-connect'
                        --disable-sqflow':disable controller sq flow control (default false)'
-                       -d':alias for --disable-sqflow'
                        --hdr-digest':enable transport protocol header digest (TCP transport)'
                        -g':alias for --hdr-digest'
                        --data-digest':enable transport protocol data digest (TCP transport)'

diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
index 8e80ddbf8479760ba106145a6e7f5a427c7b905e..bf534bd3b759100b75ae27819ab5e75d452e5436 100644 (file)
--- a/completions/bash-nvme-completion.sh
+++ b/completions/bash-nvme-completion.sh
@@ -409,7 +409,7 @@ nvme_list_opts () {
                        --nr-poll-queues= -P --queue-size= -Q \
                        --keep-alive-tmo= -k --reconnect-delay= -r \
                        --ctrl-loss-tmo= -l --fast-io-fail-tmo= -f \
-                       --tos= -T --duplicate-connect -D --disable-sqflow -d\
+                       --tos= -T --duplicate-connect -D --disable-sqflow \
                        --hdr-digest -g --data-digest -G --output-format= -o"
                        ;;
                "dim")

diff --git a/fabrics.c b/fabrics.c
index e204287dcdc9c75532107274ac4f0a16a94e94a7..035bdf3893d731cc38ac3609603d9a3251056d87 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -115,7 +115,7 @@ static const char *nvmf_context             = "execution context identification string";
                OPT_INT("keyring",              0, &c.keyring,            nvmf_keyring),         \
                OPT_INT("tls_key",              0, &c.tls_key,            nvmf_tls_key),         \
                OPT_FLAG("duplicate-connect", 'D', &c.duplicate_connect,  nvmf_dup_connect),     \
-               OPT_FLAG("disable-sqflow",    'd', &c.disable_sqflow,     nvmf_disable_sqflow),  \
+               OPT_FLAG("disable-sqflow",      0, &c.disable_sqflow,     nvmf_disable_sqflow),  \
                OPT_FLAG("hdr-digest",        'g', &c.hdr_digest,         nvmf_hdr_digest),      \
                OPT_FLAG("data-digest",       'G', &c.data_digest,        nvmf_data_digest),     \
                OPT_FLAG("tls",                 0, &c.tls,                nvmf_tls),             \