3 files changed, 4 insertions, 5 deletions

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index 35f930db3c02..f7ba006d6a65 100644
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -185,7 +185,7 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req)
         id->ssvid = 0;
 
         memset(id->sn, ' ', sizeof(id->sn));
-        snprintf(id->sn, sizeof(id->sn), "%llx", ctrl->serial);
+        snprintf(id->sn, sizeof(id->sn), "%llx", ctrl->subsys->serial);
 
         memset(id->mn, ' ', sizeof(id->mn));
         strncpy((char *)id->mn, "Linux", sizeof(id->mn));
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index b5b4ac103748..f4b02bb4a1a8 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -767,9 +767,6 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,
         memcpy(ctrl->subsysnqn, subsysnqn, NVMF_NQN_SIZE);
         memcpy(ctrl->hostnqn, hostnqn, NVMF_NQN_SIZE);
 
-        /* generate a random serial number as our controllers are ephemeral: */
-        get_random_bytes(&ctrl->serial, sizeof(ctrl->serial));
-
         kref_init(&ctrl->ref);
         ctrl->subsys = subsys;
 
@@ -928,6 +925,8 @@ struct nvmet_subsys *nvmet_subsys_alloc(const char *subsysnqn,
                 return NULL;
 
         subsys->ver = NVME_VS(1, 3, 0); /* NVMe 1.3.0 */
+        /* generate a random serial number as our controllers are ephemeral: */
+        get_random_bytes(&subsys->serial, sizeof(subsys->serial));
 
         switch (type) {
         case NVME_NQN_NVME:
diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
index 747bbdb4f9c6..e3b244c7e443 100644
--- a/drivers/nvme/target/nvmet.h
+++ b/drivers/nvme/target/nvmet.h
@@ -112,7 +112,6 @@ struct nvmet_ctrl {
 
         struct mutex            lock;
         u64                     cap;
-        u64                     serial;
         u32                     cc;
         u32                     csts;
 
@@ -152,6 +151,7 @@ struct nvmet_subsys {
         u16                     max_qid;
 
         u64                     ver;
+        u64                     serial;
         char                    *subsysnqn;
 
         struct config_group     group;