Skip to content

Commit 8d13ed8

Browse files
igawigaw
committed
nvme: remove -t as alias for --timeout
The -t option shadows a bunch of existing users, thus drop the shorthand for --timeout on global level: nvme check-tls-key --keytype nvme copy --storage-tag nvme fdp set-events --event-types nvme gen-tls-key --keytype nvme intel set-bucket-thresholds --bucket-thresholds nvme lm migration-send --stype nvme memblaze lat-set-feature-x --set-trim-threshold nvme micron latency-tracking --threshold nvme micron vs-internal-log --type nvme ocp internal-log --telemetry-type nvme ocp set-error-injection --type nvme ocp set-telemetry-profile --telemetry-profile-select nvme resv-acquire --rtype nvme resv-release --rtype nvme security-recv --al nvme security-send --tl nvme sndk vs-internal-log --type nvme tls-key --keytype nvme wdc vs-internal-log --type Signed-off-by: Daniel Wagner <[email protected]>
1 parent 0226b16 commit 8d13ed8

5 files changed

Lines changed: 53 additions & 96 deletions

File tree

‎Documentation/nvme-admin-passthru.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SYNOPSIS
1919
[--metadata-len=<len> | -m <len>]
2020
[--input-file=<file> | -i <file>]
2121
[--read | -r] [--write | -w]
22-
[--timeout=<timeout> | -t <timeout>]
22+
[--timeout=<timeout>]
2323
[--show-command | -s]
2424
[--dry-run | -d]
2525
[--raw-binary | -b]

‎Documentation/nvme-device-self-test.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SYNOPSIS
1111
'nvme device-self-test' <device> [--namespace-id=<NUM> | -n <NUM>]
1212
[--self-test-code=<NUM> | -s <NUM>] [--wait | -w]
1313
[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
14-
[--timeout=<timeout> | -t <timeout>]
14+
[--timeout=<timeout>]
1515

1616
DESCRIPTION
1717
-----------
@@ -55,7 +55,6 @@ OPTIONS
5555
--verbose::
5656
Increase the information detail in the output.
5757

58-
-t <timeout>::
5958
--timeout=<timeout>::
6059
Override default timeout value. In milliseconds.
6160

‎completions/_nvme‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ _nvme () {
389389
--output-format=':Output format: normal|json|binary'
390390
-o ':alias for --output-format'
391391
--timeout=':value for timeout'
392-
-t ':alias for --timeout'
393392
)
394393
_arguments '*:: :->subcmds'
395394
_describe -t commands "nvme ocp hardware-component-log options" _hardware_component_log
@@ -840,7 +839,6 @@ _nvme () {
840839
--output-format=':Output format: normal|json|binary'
841840
-o':alias for --output-format'
842841
--timeout=':value for timeout'
843-
-t':alias of --timeout'
844842
)
845843
_arguments '*:: :->subcmds'
846844
_describe -t commands "nvme list-ns options" _listns
@@ -1022,7 +1020,6 @@ _nvme () {
10221020
--block-size=':target block size'
10231021
-b':alias of --block-size'
10241022
--timeout=':value for timeout'
1025-
-t':alias of --timeout'
10261023
--csi=':command set identifier'
10271024
-y':alias of --csi'
10281025
--lbstm=':logical block storage tag mask'
@@ -1052,7 +1049,6 @@ _nvme () {
10521049
--namespace-id=':namespace to delete'
10531050
-n':alias of --namespace-id'
10541051
--timeout=':value for timeout'
1055-
-t':alias of --timeout'
10561052
)
10571053
_arguments '*:: :->subcmds'
10581054
_describe -t commands "nvme delete-ns options" _deletens
@@ -1280,7 +1276,6 @@ _nvme () {
12801276
--csi=':command set identifier'
12811277
-c':alias of --csi'
12821278
--timeout=':value for timeout'
1283-
-t':alias of --timeout'
12841279
)
12851280
_arguments '*:: :->subcmds'
12861281
_describe -t commands "nvme effects-log options" _effects_log
@@ -1359,7 +1354,6 @@ _nvme () {
13591354
--raw-binary':dump infos in binary format'
13601355
-b':alias to --raw-binary'
13611356
--timeout=':value for timeout'
1362-
-t':alias of --timeout'
13631357
--human-readable':show feature in readable format'
13641358
-H':alias of --human-readable'
13651359
--changed':show feature changed'
@@ -1379,7 +1373,6 @@ _nvme () {
13791373
--wait':Wait for the test to finish'
13801374
-w':alias to --wait'
13811375
--timeout=':value for timeout'
1382-
-t':alias of --timeout'
13831376
)
13841377
_arguments '*:: :->subcmds'
13851378
_describe -t commands "nvme device-self-test options" _device_self_test
@@ -1413,7 +1406,6 @@ _nvme () {
14131406
--uuid=':UUID Index field required aligned with Scope'
14141407
-U':alias of --uuid'
14151408
--timeout=':value for timeout'
1416-
-t':alias of --timeout'
14171409
)
14181410
_arguments '*:: :->subcmds'
14191411
_describe -t commands "nvme lockdown options" _lockdown
@@ -1435,7 +1427,6 @@ _nvme () {
14351427
--uuid-index=':uuid index'
14361428
-U':alias for --uuid-index'
14371429
--timeout=':value for timeout'
1438-
-t':alias of --timeout'
14391430
)
14401431
_arguments '*:: :->subcmds'
14411432
_describe -t commands "nvme set-feature options" _setf
@@ -1449,7 +1440,6 @@ _nvme () {
14491440
--value=':the value of the property to be set'
14501441
-V':alias to --value'
14511442
--timeout=':value for timeout'
1452-
-t':alias of --timeout'
14531443
)
14541444
_arguments '*:: :->subcmds'
14551445
_describe -t commands "nvme set-property options" _set_property
@@ -1463,7 +1453,6 @@ _nvme () {
14631453
--human-readable':show infos in readable format'
14641454
-H':alias of --human-readable'
14651455
--timeout=':value for timeout'
1466-
-t':alias of --timeout'
14671456
)
14681457
_arguments '*:: :->subcmds'
14691458
_describe -t commands "nvme get-property options" _get_property
@@ -1475,7 +1464,6 @@ _nvme () {
14751464
--namespace-id=':<nsid> of namespace to format (required)'
14761465
-n':alias of --namespace-id'
14771466
--timeout=':value for timeout'
1478-
-t':alias of --timeout'
14791467
--lbaf=':LBA format to apply to namespace (required)'
14801468
-l':alias of --lbaf'
14811469
--ses=':secure erase? 0 - no-op (default), 1 - user-data erase, 2 - cryptographic erase'
@@ -1499,7 +1487,6 @@ _nvme () {
14991487
--slot=':firmware slot to activate'
15001488
-s':alias of --slot'
15011489
--timeout=':value for timeout'
1502-
-t':alias of --timeout'
15031490
)
15041491
_arguments '*:: :->subcmds'
15051492
_describe -t commands "nvme fw-commit options" _fw_commit
@@ -1515,7 +1502,6 @@ _nvme () {
15151502
--offset=':starting offset, in dwords (defaults to 0, only useful if download is split across multiple files)'
15161503
-O':alias of --offset'
15171504
--timeout=':value for timeout'
1518-
-t':alias of --timeout'
15191505
)
15201506
_arguments '*:: :->subcmds'
15211507
_describe -t commands "nvme fw-download options" _fwd
@@ -1533,7 +1519,6 @@ _nvme () {
15331519
--cap-upper=':Most significant 32 bits of the capacity in bytes'
15341520
-u':alias of --cap-upper'
15351521
--timeout=':value for timeout'
1536-
-t':alias of --timeout'
15371522
)
15381523
_arguments '*:: :->subcmds'
15391524
_describe -t commands "nvme capacity-mgmt options" _capacity_mgmt
@@ -1573,7 +1558,6 @@ _nvme () {
15731558
--namespace-zeroes':If set, then the controller clear all logical blocks to zero in the entire namespace'
15741559
-Z':alias of --namespace-zeroes'
15751560
--timeout=':value for timeout'
1576-
-t':alias of --timeout'
15771561
)
15781562
_arguments '*:: :->subcmds'
15791563
_describe -t commands "nvme write-zeroes options" _write_zeroes
@@ -1593,7 +1577,6 @@ _nvme () {
15931577
--dir-spec':directive specific'
15941578
-S':alias of --dir-spec'
15951579
--timeout=':value for timeout'
1596-
-t':alias of --timeout'
15971580
)
15981581
_arguments '*:: :->subcmds'
15991582
_describe -t commands "nvme write-uncor options" _write_uncor
@@ -1625,7 +1608,6 @@ _nvme () {
16251608
--storage-tag-check':Storage Tag field shall be checked as part of end-to-end data protection processing'
16261609
-C':alias of --storage-tag-check'
16271610
--timeout=':value for timeout'
1628-
-t':alias of --timeout'
16291611
)
16301612
_arguments '*:: :->subcmds'
16311613
_describe -t commands "nvme verify options" _verify
@@ -1743,7 +1725,6 @@ _nvme () {
17431725
--metadata-len=':length for metadata buffer'
17441726
-m':alias of --metadata-len'
17451727
--timeout=':value for timeout'
1746-
-t':alias of --timeout'
17471728
--cdw2=':value for command dword 2'
17481729
-2':alias for --cdw2'
17491730
--cdw3=':value for command dword 3'
@@ -1793,7 +1774,6 @@ _nvme () {
17931774
--metadata-len=':length for metadata buffer'
17941775
-m':alias of --metadata-len'
17951776
--timeout=':value for timeout'
1796-
-t':alias of --timeout'
17971777
--cdw2=':value for command dword 2'
17981778
-2':alias for --cdw2'
17991779
--cdw3=':value for command dword 3'
@@ -1858,7 +1838,6 @@ _nvme () {
18581838
--raw-binary':dump output in binary format'
18591839
-b':alias for --raw-binary'
18601840
--timeout=':value for timeout'
1861-
-t':alias for --timeout'
18621841
)
18631842
_arguments '*:: :->subcmds'
18641843
_describe -t commands "nvme security-recv options" _srecv
@@ -1878,7 +1857,6 @@ _nvme () {
18781857
--range-len=':Range Length(RL) specifies the length of the range of contiguous LBAs beginning at SLBA'
18791858
-l':alias for --range-len'
18801859
--timeout':value for timeout'
1881-
-t':alias for --timeout'
18821860
--output-format=':Output format: normal|json|binary'
18831861
-o':alias for --output-format'
18841862
)
@@ -1936,7 +1914,6 @@ _nvme () {
19361914
--raw-binary':dump output in binary format'
19371915
-b':alias of --raw-binary'
19381916
--timeout=':value for timeout'
1939-
-t':alias of --timeout'
19401917
)
19411918
_arguments '*:: :->subcmds'
19421919
_describe -t commands "nvme resv-report options" _rep
@@ -1958,7 +1935,6 @@ _nvme () {
19581935
--iekey':ignore existing reservation key'
19591936
-i':alias for --iekey'
19601937
--timeout=':value for timeout'
1961-
-t':alias of --timeout'
19621938
)
19631939
_arguments '*:: :->subcmds'
19641940
_describe -t commands "nvme resv-register options" _reg
@@ -1984,7 +1960,6 @@ _nvme () {
19841960
--cdw11=':value for command dword 11'
19851961
-c':alias for --cdw11'
19861962
--timeout=':value for timeout'
1987-
-t':alias of --timeout'
19881963
)
19891964
_arguments '*:: :->subcmds'
19901965
_describe -t commands "nvme dsm options" _dsm
@@ -2026,7 +2001,6 @@ _nvme () {
20262001
--format=':source range entry format'
20272002
-F':alias of --format'
20282003
--timeout=':value for timeout'
2029-
-t':alias of --timeout'
20302004
)
20312005
_arguments '*:: :->subcmds'
20322006
_describe -t commands "nvme copy options" _copy
@@ -2161,7 +2135,6 @@ _nvme () {
21612135
_shor=(
21622136
/dev/nvme':supply a device to use (required)'
21632137
--timeout=':value for timeout'
2164-
-t':alias of --timeout'
21652138
)
21662139
_arguments '*:: :->subcmds'
21672140
_describe -t commands "nvme show-regs options" _shor
@@ -2471,7 +2444,6 @@ _nvme () {
24712444
--human-readable':show infos in readable format'
24722445
-H':alias of --human-readable'
24732446
--timeout=':value for timeout'
2474-
-t':alias of --timeout'
24752447
)
24762448
_arguments '*:: :->subcmds'
24772449
_describe -t commands "nvme dir-receive options" _dir_receive
@@ -2501,7 +2473,6 @@ _nvme () {
25012473
--input-file=':write/send file (default stdin)'
25022474
-i':alias of --input-file'
25032475
--timeout=':value for timeout'
2504-
-t':alias of --timeout'
25052476
)
25062477
_arguments '*:: :->subcmds'
25072478
_describe -t commands "nvme dir-send options" _dir_send
@@ -2519,7 +2490,6 @@ _nvme () {
25192490
--nr=':Number of Controller Resources(NR)'
25202491
-n':alias of --nr'
25212492
--timeout=':value for timeout'
2522-
-t':alias of --timeout'
25232493
)
25242494
_arguments '*:: :->subcmds'
25252495
_describe -t commands "nvme virt-mgmt options" _virt_mgmt
@@ -2646,7 +2616,6 @@ _nvme () {
26462616
--verbose':Increase the information detail in the output.'
26472617
-v':alias for --verbose'
26482618
--timeout=':value for timeout'
2649-
-t':alias of --timeout'
26502619
)
26512620
_arguments '*:: :->subcmds'
26522621
_describe -t commands "nvme get-reg options" _get_reg
@@ -2681,7 +2650,6 @@ _nvme () {
26812650
--verbose':Increase the information detail in the output.'
26822651
-v':alias for --verbose'
26832652
--timeout=':value for timeout'
2684-
-t':alias of --timeout'
26852653
)
26862654
_arguments '*:: :->subcmds'
26872655
_describe -t commands "nvme set-reg options" _set_reg
@@ -2705,7 +2673,6 @@ _nvme () {
27052673
--verbose':Increase the information detail in the output.'
27062674
-v':alias for --verbose'
27072675
--timeout=':value for timeout'
2708-
-t':alias of --timeout'
27092676
)
27102677
_arguments '*:: :->subcmds'
27112678
_describe -t commands "nvme io-mgmt-recv-reg options" _io_mgmt_recv
@@ -2729,7 +2696,6 @@ _nvme () {
27292696
--verbose':Increase the information detail in the output.'
27302697
-v':alias for --verbose'
27312698
--timeout=':value for timeout'
2732-
-t':alias of --timeout'
27332699
)
27342700
_arguments '*:: :->subcmds'
27352701
_describe -t commands "nvme io-mgmt-send options" _io_mgmt_send
@@ -2743,7 +2709,6 @@ _nvme () {
27432709
--output-format=':Output format: normal|json|binary'
27442710
-o ':alias for --output-format'
27452711
--timeout=':value for timeout'
2746-
-t ':alias for --timeout'
27472712
)
27482713
_arguments '*:: :->subcmds'
27492714
_describe -t commands "nvme mgmt-addr-list-log" _mal_log
@@ -2773,7 +2738,6 @@ _nvme () {
27732738
--verbose':Increase the information detail in the output.'
27742739
-v':alias for --verbose'
27752740
--timeout=':value for timeout'
2776-
-t ':alias for --timeout'
27772741
)
27782742
_arguments '*:: :->subcmds'
27792743
_describe -t commands "nvme changed-alloc-ns-list-log options" _changed_alloc_ns_list_log
@@ -2789,7 +2753,6 @@ _nvme () {
27892753
--output-format=':Output format: normal|json|binary'
27902754
-o ':alias for --output-format'
27912755
--timeout=':value for timeout'
2792-
-t ':alias for --timeout'
27932756
)
27942757
_arguments '*:: :->subcmds'
27952758
_describe -t commands "nvme dispersed-ns-participating-nss-log" _dns_psub_log
@@ -2807,7 +2770,6 @@ _nvme () {
28072770
--output-format=':Output format: normal|json|binary'
28082771
-o ':alias for --output-format'
28092772
--timeout=':value for timeout'
2810-
-t ':alias for --timeout'
28112773
)
28122774
_arguments '*:: :->subcmds'
28132775
_describe -t commands "nvme reachability-groups-log" _rg_log
@@ -2825,7 +2787,6 @@ _nvme () {
28252787
--output-format=':Output format: normal|json|binary'
28262788
-o ':alias for --output-format'
28272789
--timeout=':value for timeout'
2828-
-t ':alias for --timeout'
28292790
)
28302791
_arguments '*:: :->subcmds'
28312792
_describe -t commands "nvme reachability-associationsroups-log" _ra_log
@@ -2843,7 +2804,6 @@ _nvme () {
28432804
--output-format=':Output format: normal|json|binary'
28442805
-o ':alias for --output-format'
28452806
--timeout=':value for timeout'
2846-
-t ':alias for --timeout'
28472807
)
28482808
_arguments '*:: :->subcmds'
28492809
_describe -t commands "nvme host-discovery-log" _hd_log
@@ -2859,7 +2819,6 @@ _nvme () {
28592819
--output-format=':Output format: normal|json|binary'
28602820
-o ':alias for --output-format'
28612821
--timeout=':value for timeout'
2862-
-t ':alias for --timeout'
28632822
)
28642823
_arguments '*:: :->subcmds'
28652824
_describe -t commands "nvme ave-discovery-log" _ad_log
@@ -2875,7 +2834,6 @@ _nvme () {
28752834
--output-format=':Output format: normal|json|binary'
28762835
-o ':alias for --output-format'
28772836
--timeout=':value for timeout'
2878-
-t ':alias for --timeout'
28792837
)
28802838
_arguments '*:: :->subcmds'
28812839
_describe -t commands "nvme pull-model-ddr-req-log" _pmdr_log

0 commit comments

Comments
 (0)