From: keithbusch <keith.busch@intel.com>
Date: Fri, 4 Mar 2016 22:44:28 +0000 (-0700)
Subject: Merge pull request #67 from wdc-tools/master
X-Git-Tag: v0.5~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=86b72f596b835d28c757c84c3458d2036236aff1;p=users%2Fsagi%2Fnvme-cli.git

Merge pull request #67 from wdc-tools/master

Fixed option checking for format to match NVMe spec limits.
---

86b72f596b835d28c757c84c3458d2036236aff1
diff --cc nvme.c
index fd2187a6,55ae51f0..0344812b
--- a/nvme.c
+++ b/nvme.c
@@@ -1263,15 -1330,17 +1263,15 @@@ static int show_registers(int argc, cha
  
  static int format(int argc, char **argv)
  {
 -	const char *desc = "format: re-format a specified namespace on the "\
 +	const char *desc = "Re-format a specified namespace on the "\
  		"given device. Can erase all data in namespace (user "\
  		"data erase) or delete data encryption key if specified. "\
 -		"Can also be used to change LBAF such that device may "\
 -		"disappear from all lists since capacity superficially "\
 -		"appears to be 0.";
 +		"Can also be used to change LBAF to change the namespaces reported physical block format.";
  	const char *namespace_id = "name of desired namespace";
 -	const char *lbaf = "LBA format to apply (req'd)";
 +	const char *lbaf = "LBA format to apply (required)";
  	const char *ses = "[0-2]: secure erase";
- 	const char *pil = "[0-3]: protection info location";
- 	const char *pi = "[0-1]: protection info off/on";
+ 	const char *pil = "[0-1]: protection info location last/first 8 bytes of metadata";
+ 	const char *pi = "[0-3]: protection info off/Type 1/Type 2/Type 3";
  	const char *ms = "[0-1]: extended format off/on";
  	const char *timeout = "timeout value";
  	int err;