diff options
author | Sagi Grimberg <sagi@grimberg.me> | 2018-11-02 16:12:21 -0700 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2018-11-09 06:14:47 -0700 |
commit | 21d3bbdd4c342f16eac8d70893e45cdfa3381a1e (patch) | |
tree | d915be94baffddd1487ed4be98dc480c0647c96f /drivers/nvme | |
parent | bb39ba6a8deab70752b836a36c62205b1c65b559 (diff) | |
download | linux-21d3bbdd4c342f16eac8d70893e45cdfa3381a1e.tar.bz2 |
nvmet: don't try to add ns to p2p map unless it actually uses it
Even without CONFIG_P2PDMA this results in a error print:
nvmet: no peer-to-peer memory is available that's supported by rxe0 and /dev/nullb0
Fixes: c6925093d0b2 ("nvmet: Optionally use PCI P2P memory")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvme')
-rw-r--r-- | drivers/nvme/target/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index f4efe289dc7b..a5f9bbce863f 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -420,7 +420,7 @@ static void nvmet_p2pmem_ns_add_p2p(struct nvmet_ctrl *ctrl, struct pci_dev *p2p_dev; int ret; - if (!ctrl->p2p_client) + if (!ctrl->p2p_client || !ns->use_p2pmem) return; if (ns->p2p_dev) { |