Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1655038

[PATCH v2 8/8] nvmet: use NVME_IDENTIFY_DATA_SIZE

Show all headers | View raw

Use NVME_IDENTIFY_DATA_SIZE define instead of hard coding the magic
4096 value.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
 drivers/nvme/target/admin-cmd.c | 4 ++--
 drivers/nvme/target/discovery.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index 833b5ef935c3..def6cde1e714 100644
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -336,7 +336,7 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req)
 
 static void nvmet_execute_identify_nslist(struct nvmet_req *req)
 {
-	static const int buf_size = 4096;
+	static const int buf_size = NVME_IDENTIFY_DATA_SIZE;
 	struct nvmet_ctrl *ctrl = req->sq->ctrl;
 	struct nvmet_ns *ns;
 	u32 min_nsid = le32_to_cpu(req->cmd->identify.nsid);
@@ -554,7 +554,7 @@ u16 nvmet_parse_admin_cmd(struct nvmet_req *req)
 		}
 		break;
 	case nvme_admin_identify:
-		req->data_len = 4096;
+		req->data_len = NVME_IDENTIFY_DATA_SIZE;
 		switch (cmd->identify.cns) {
 		case NVME_ID_CNS_NS:
 			req->execute = nvmet_execute_identify_ns;
diff --git a/drivers/nvme/target/discovery.c b/drivers/nvme/target/discovery.c
index 1aaf597e81fc..c7a90384dd75 100644
--- a/drivers/nvme/target/discovery.c
+++ b/drivers/nvme/target/discovery.c
@@ -185,7 +185,7 @@ u16 nvmet_parse_discovery_cmd(struct nvmet_req *req)
 		return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;
 		}
 	case nvme_admin_identify:
-		req->data_len = 4096;
+		req->data_len = NVME_IDENTIFY_DATA_SIZE;
 		switch (cmd->identify.cns) {
 		case NVME_ID_CNS_CTRL:
 			req->execute =
-- 
2.12.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/8] Implement NVMe Namespace Descriptor Identification Johannes Thumshirn <jthumshirn@suse.de> - 2017-06-01 13:20 +0200
  [PATCH v2 6/8] nvme: provide UUID value to userspace Johannes Thumshirn <jthumshirn@suse.de> - 2017-06-01 13:20 +0200
    Re: [PATCH v2 6/8] nvme: provide UUID value to userspace Keith Busch <keith.busch@intel.com> - 2017-06-01 14:40 +0200
      Re: [PATCH v2 6/8] nvme: provide UUID value to userspace Johannes Thumshirn <jthumshirn@suse.de> - 2017-06-01 15:10 +0200
  [PATCH v2 7/8] nvmet: allow overriding the NVMe VS via configfs Johannes Thumshirn <jthumshirn@suse.de> - 2017-06-01 13:20 +0200
  [PATCH v2 8/8] nvmet: use NVME_IDENTIFY_DATA_SIZE Johannes Thumshirn <jthumshirn@suse.de> - 2017-06-01 13:20 +0200
  [PATCH v2 2/8] nvme: rename uuid to nguid in nvme_ns Johannes Thumshirn <jthumshirn@suse.de> - 2017-06-01 13:20 +0200
    Re: [PATCH v2 2/8] nvme: rename uuid to nguid in nvme_ns Johannes Thumshirn <jthumshirn@suse.de> - 2017-06-07 15:50 +0200
    Re: [PATCH v2 2/8] nvme: rename uuid to nguid in nvme_ns Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-06-07 15:50 +0200
  [PATCH v2 1/8] nvme: introduce NVMe Namespace Identification Descriptor structures Johannes Thumshirn <jthumshirn@suse.de> - 2017-06-01 13:20 +0200
  [PATCH v2 3/8] nvmet: implement namespace identify descriptor list Johannes Thumshirn <jthumshirn@suse.de> - 2017-06-01 13:20 +0200
  [PATCH v2 5/8] nvme: get list of namespace descriptors Johannes Thumshirn <jthumshirn@suse.de> - 2017-06-01 13:30 +0200

csiph-web