---

yaml --- r: 286227 b: refs/heads/master c: 7b4fe9b h: refs/heads/master i: 286225: 6e71a78 286223: 2acc8f4 v: v3
git-mirror · Nov 4, 2011 · a95fae1 · a95fae1
1 parent 4b3c506
commit a95fae1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36c14ed9caa957c686d4a48fd598a5ec2aa0331b
+refs/heads/master: 7b4fe9b1cb4b9a6f4ae23a12ef96d08d96e2a5da
diff --git a/trunk/include/linux/nvme.h b/trunk/include/linux/nvme.h
@@ -142,6 +142,18 @@ enum nvme_opcode {
 	nvme_cmd_dsm		= 0x09,
 };
 
+struct nvme_common_command {
+	__u8			opcode;
+	__u8			flags;
+	__u16			command_id;
+	__le32			nsid;
+	__u64			rsvd2;
+	__le64			metadata;
+	__le64			prp1;
+	__le64			prp2;
+	__u32			rsvd10[6];
+};
+
 struct nvme_rw_command {
 	__u8			opcode;
 	__u8			flags;
@@ -284,14 +296,6 @@ struct nvme_delete_queue {
 	__le32			rsvd11[5];
 };
 
-struct nvme_common_command {
-	__u8			opcode;
-	__u8			flags;
-	__u16			command_id;
-	__le32			nsid;
-	__u32			rsvd2[14];
-};
-
 struct nvme_command {
 	union {
 		struct nvme_common_command common;