diff options
author | Johannes Thumshirn <jthumshirn@suse.de> | 2017-07-14 15:36:55 +0200 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2017-07-20 08:41:56 -0600 |
commit | 2e7f5d2af2155084c6f7c86328d36e698cd84954 (patch) | |
tree | df762b2b134f4e0e171fe1d3b13e2fbdb163e659 /drivers/nvme/target/admin-cmd.c | |
parent | 41528f8036f835e44884f4b0ce0d18191aa0a98f (diff) | |
download | linux-2e7f5d2af2155084c6f7c86328d36e698cd84954.tar.bz2 |
nvmet: Move serial number from controller to subsystem
The NVMe specification defines the serial number as:
"Serial Number (SN): Contains the serial number for the NVM subsystem
that is assigned by the vendor as an ASCII string. Refer to section
7.10 for unique identifier requirements. Refer to section 1.5 for ASCII
string requirements"
So move it from the controller to the subsystem, where it belongs.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvme/target/admin-cmd.c')
-rw-r--r-- | drivers/nvme/target/admin-cmd.c | 2 |
1 files changed, 1 insertions, 1 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)); |