From a95fae1800998e9f318ef176727d2156ba57dfe5 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew.r.wilcox@intel.com>
Date: Wed, 26 Jan 2011 10:01:21 -0500
Subject: [PATCH] --- yaml --- r: 286227 b: refs/heads/master c:
 7b4fe9b1cb4b9a6f4ae23a12ef96d08d96e2a5da h: refs/heads/master i:   286225:
 6e71a78bea50d2178530bb77cfc868c2609759f7   286223:
 2acc8f41963b34e80131e9375859267a8ec9de2f v: v3

---
 [refs]                     |  2 +-
 trunk/include/linux/nvme.h | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 382d493bc04b..3861303221a0 100644
--- 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
index 9ba53584f722..1c0b5ef08959 100644
--- 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;