Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-14 10:22:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-14 10:22:45 -0800
commit9443c168505d308f5ecd8c0db249f6f62a39c448 (patch)
tree5bc9ef9e092aaa50509c9b1dda38c5698f535e6b
parent40548c6b6c134275c750eb372dc2cf8ee1bbc3d4 (diff)
parent32835a074171e7b83c1cefbbf9d681bb9518bbd5 (diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull NVMe fix from Jens Axboe: "Just a single fix for nvme over fabrics that should go into 4.15" * 'for-linus' of git://git.kernel.dk/linux-block: nvme-fabrics: initialize default host->id in nvmf_host_default()
-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);