Commit 9443c168 authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 40548c6b 32835a07
...@@ -74,6 +74,7 @@ static struct nvmf_host *nvmf_host_default(void) ...@@ -74,6 +74,7 @@ static struct nvmf_host *nvmf_host_default(void)
return NULL; return NULL;
kref_init(&host->ref); kref_init(&host->ref);
uuid_gen(&host->id);
snprintf(host->nqn, NVMF_NQN_SIZE, snprintf(host->nqn, NVMF_NQN_SIZE,
"nqn.2014-08.org.nvmexpress:uuid:%pUb", &host->id); "nqn.2014-08.org.nvmexpress:uuid:%pUb", &host->id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment