mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Johannes Thumshirn <jthumshirn@suse.de>
To: Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
	Keith Busch <keith.busch@intel.com>
Cc: Hannes Reinecke <hare@suse.de>,
	maxg@mellanox.com,
	Linux NVMe Mailinglist <linux-nvme@lists.infradead.org>,
	Linux Kernel Mailinglist <linux-kernel@vger.kernel.org>,
	Johannes Thumshirn <jthumshirn@suse.de>
Subject: [PATCH v5 2/9] nvmet: use NVME_IDENTIFY_DATA_SIZE
Date: Tue,  6 Jun 2017 16:36:10 +0200	[thread overview]
Message-ID: <20170606143617.32143-3-jthumshirn@suse.de> (raw)
In-Reply-To: <20170606143617.32143-1-jthumshirn@suse.de>

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

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Hannes Reinecke <hare@suse.com>
---
 drivers/nvme/target/admin-cmd.c | 4 ++--
 drivers/nvme/target/discovery.c | 2 +-
 include/linux/nvme.h            | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index ff1f97006322..96c144325443 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);
@@ -504,7 +504,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 =
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index e400a69fa1d3..c004af5faa48 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -659,6 +659,8 @@ struct nvme_identify {
 	__u32			rsvd11[5];
 };
 
+#define NVME_IDENTIFY_DATA_SIZE 4096
+
 struct nvme_features {
 	__u8			opcode;
 	__u8			flags;
-- 
2.12.3

  parent reply	other threads:[~2017-06-06 14:38 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-06 14:36 [PATCH v5 0/9] Implement NVMe Namespace Descriptor Identification Johannes Thumshirn
2017-06-06 14:36 ` [PATCH v5 1/9] scatterlist: add sg_zeroout_area() helper Johannes Thumshirn
2017-06-06 18:26   ` Sagi Grimberg
2017-06-07  7:00     ` Johannes Thumshirn
2017-06-06 14:36 ` Johannes Thumshirn [this message]
2017-06-06 14:36 ` [PATCH v5 3/9] nvme: introduce NVMe Namespace Identification Descriptor structures Johannes Thumshirn
2017-06-06 14:36 ` [PATCH v5 4/9] nvme: rename uuid to nguid in nvme_ns Johannes Thumshirn
2017-06-06 14:36 ` [PATCH v5 5/9] nvmet: implement namespace identify descriptor list Johannes Thumshirn
2017-06-07  8:55   ` Max Gurtovoy
2017-06-06 14:36 ` [PATCH v5 6/9] nvmet: add uuid field to nvme_ns and populate via configfs Johannes Thumshirn
2017-06-06 14:36 ` [PATCH v5 7/9] nvme: get list of namespace descriptors Johannes Thumshirn
2017-06-06 18:30   ` Sagi Grimberg
2017-06-07  6:57     ` Johannes Thumshirn
2017-06-06 14:36 ` [PATCH v5 8/9] nvme: provide UUID value to userspace Johannes Thumshirn
2017-06-06 14:36 ` [PATCH v5 9/9] nvmet: allow overriding the NVMe VS via configfs Johannes Thumshirn
2017-06-07  4:47   ` Guan Junxiong
2017-06-06 18:27 ` [PATCH v5 0/9] Implement NVMe Namespace Descriptor Identification Sagi Grimberg
2017-06-07  6:59   ` Johannes Thumshirn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170606143617.32143-3-jthumshirn@suse.de \
    --to=jthumshirn@suse.de \
    --cc=hare@suse.de \
    --cc=hch@lst.de \
    --cc=keith.busch@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=maxg@mellanox.com \
    --cc=sagi@grimberg.me \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®