nvme: define NVME_NSID_ALL

Define the constant "0xffffffff" (used as nsid for all namespaces)
as NVME_NSID_ALL.

Signed-off-by: Arnav Dawn <a.dawn@samsung.com>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 1a1dedbac39b0d886d1181a92e0aecfe797f6151..a6afeedc009afe969b49082fc21de112a42dbce8 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -312,7 +312,7 @@ static int nvme_toggle_streams(struct nvme_ctrl *ctrl, bool enable)
        memset(&c, 0, sizeof(c));
 
        c.directive.opcode = nvme_admin_directive_send;
-       c.directive.nsid = cpu_to_le32(0xffffffff);
+       c.directive.nsid = cpu_to_le32(NVME_NSID_ALL);
        c.directive.doper = NVME_DIR_SND_ID_OP_ENABLE;
        c.directive.dtype = NVME_DIR_IDENTIFY;
        c.directive.tdtype = NVME_DIR_STREAMS;
@@ -362,7 +362,7 @@ static int nvme_configure_directives(struct nvme_ctrl *ctrl)
        if (ret)
                return ret;
 
-       ret = nvme_get_stream_params(ctrl, &s, 0xffffffff);
+       ret = nvme_get_stream_params(ctrl, &s, NVME_NSID_ALL);
        if (ret)
                return ret;
 
@@ -2563,7 +2563,7 @@ static void nvme_get_fw_slot_info(struct nvme_ctrl *ctrl)
                return;
 
        c.common.opcode = nvme_admin_get_log_page;
-       c.common.nsid = cpu_to_le32(0xffffffff);
+       c.common.nsid = cpu_to_le32(NVME_NSID_ALL);
        c.common.cdw10[0] = nvme_get_log_dw10(NVME_LOG_FW_SLOT, sizeof(*log));
 
        if (!nvme_submit_sync_cmd(ctrl->admin_q, &c, log, sizeof(*log)))

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 5d0f2f4fc3b88cf85530b67f18453dfb909bf042..1d79046bf9d410ee4cfa6bf4614d7fc6e4b36505 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -32,6 +32,8 @@
 
 #define NVME_RDMA_IP_PORT      4420
 
+#define NVME_NSID_ALL          0xffffffff
+
 enum nvme_subsys_type {
        NVME_NQN_DISC   = 1,            /* Discovery type target subsystem */
        NVME_NQN_NVME   = 2,            /* NVME type target subsystem */