summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2018-01-12 18:42:36 +0100
committerJens Axboe <axboe@kernel.dk>2018-01-12 18:42:36 +0100
commit32835a074171e7b83c1cefbbf9d681bb9518bbd5 (patch)
tree8a577c43f42bbb55b7fcfca8a8616ab6e5d943e5 /drivers
parentloop: fix concurrent lo_open/lo_release (diff)
parentnvme-fabrics: initialize default host->id in nvmf_host_default() (diff)
downloadlinux-32835a074171e7b83c1cefbbf9d681bb9518bbd5.tar.xz
linux-32835a074171e7b83c1cefbbf9d681bb9518bbd5.zip
Merge branch 'nvme-4.15' of git://git.infradead.org/nvme into for-linus
Pull a single NVMe fix from Christoph for 4.15.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nvme/host/fabrics.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
index 76b4fe6816a0..894c2ccb3891 100644
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
@@ -74,6 +74,7 @@ static struct nvmf_host *nvmf_host_default(void)
return NULL;
kref_init(&host->ref);
+ uuid_gen(&host->id);
snprintf(host->nqn, NVMF_NQN_SIZE,
"nqn.2014-08.org.nvmexpress:uuid:%pUb", &host->id);