nvme: remove the magic 1024 constant in nvme_scan_ns_list

Replace it with a value derived from the identify data and nsid sizes.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 15b63426a113d6d913651bcc7f58fbee411c886a..d0f65322156c17c09060dbce7d8ad479005278a3 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3742,6 +3742,7 @@ static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
 
 static int nvme_scan_ns_list(struct nvme_ctrl *ctrl)
 {
+       const int nr_entries = NVME_IDENTIFY_DATA_SIZE / sizeof(__le32);
        __le32 *ns_list;
        u32 prev = 0;
        int ret = 0, i;
@@ -3758,7 +3759,7 @@ static int nvme_scan_ns_list(struct nvme_ctrl *ctrl)
                if (ret)
                        goto free;
 
-               for (i = 0; i < 1024; i++) {
+               for (i = 0; i < nr_entries; i++) {
                        u32 nsid = le32_to_cpu(ns_list[i]);
 
                        if (!nsid)      /* end of the list? */