Merging upstream version 2.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 23 insertions, 4 deletions

diff --git a/completions/_nvme b/completions/_nvme
index 5910898..7702fcc 100644
--- a/completions/_nvme
+++ b/completions/_nvme
@@ -231,9 +231,23 @@ _nvme () {
 			--dps=':data protection?'
 			-d':alias of --dps'
 			--nmic=':multipath and sharing'
-			-n':alias of --nmic'
+			-m':alias of --nmic'
+			--anagrp-id=':ANA Group Identifier'
+			-a':alias of --anagrp-id'
+			--nvmset-id=':NVM Set Identifier'
+			-i':alias of --nvmset-id'
+			--block-size=':target block size'
+			-b':alias of --block-size'
+			--timeout=':value for timeout'
+			-t':alias of --timeout'
 			--csi=':command set identifier'
 			-y':alias of --csi'
+			--lbstm=':logical block storage tag mask'
+			-l':alias of --lbstm'
+			--nsze-si=':size of ns (NSZE) in standard SI units'
+			-S':alias of --nsze-si'
+			--ncap-si=':capacity of ns (NCAP) in standard SI units'
+			-C':alias of --ncap-si'
 			)
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme create-ns options" _createns
@@ -244,6 +258,8 @@ _nvme () {
 			/dev/nvme':supply a device to use (required)'
 			--namespace-id=':namespace to delete'
 			-n':alias of --namespace-id'
+			--timeout=':value for timeout'
+			-t':alias of --timeout'
 			)
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme delete-ns options" _deletens
@@ -505,6 +521,8 @@ _nvme () {
 			/dev/nvme':supply a device to use (required)'
 			--namespace-id=':<nsid> of namespace to format (required)'
 			-n':alias of --namespace-id'
+			--timeout=':value for timeout'
+			-t':alias of --timeout'
 			--lbaf=':LBA format to apply to namespace (required)'
 			-l':alias of --lbaf'
 			--ses=':secure erase? 0 - no-op (default), 1 - user-data erase, 2 - cryptographic erase'
diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
index c5fbda0..fae3ab4 100644
--- a/completions/bash-nvme-completion.sh
+++ b/completions/bash-nvme-completion.sh
@@ -92,8 +92,9 @@ nvme_list_opts () {
 			;;
 		"create-ns")
 		opts+=" --nsze= -s --ncap= -c --flbas= -f \
-			--dps= -d --nmic= -n --anagrp-id= -a --nvmset-id= -i \
-			--block-size= -b --timeout= -t--csi= -y"
+			--dps= -d --nmic= -m --anagrp-id= -a --nvmset-id= -i \
+			--block-size= -b --timeout= -t --csi= -y --lbstm= -l \
+			--nsze-si= -S --ncap-si= -C"
 			;;
 		"delete-ns")
 		opts+=" -namespace-id= -n --timeout= -t"
@@ -312,7 +313,7 @@ nvme_list_opts () {
 			--dir-type= -T --dir-spec= -S --dsm= -D --show-command -v \
 			--dry-run -w --latency -t"
 			;;
-		"write-zeros")
+		"write-zeroes")
 		opts+=" --namespace-id= -n --start-block= -s \
 			--block-count= -c --deac -d --limited-retry -l \
 			--force-unit-access -f --prinfo= -p --ref-tag= -r \