diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-11-30 10:08:39 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-11-30 10:08:39 -0700 |
| commit | 1c9b357ced0b2fd2c173c058c2de88af513bc064 (patch) | |
| tree | d81f637364271e76b6ea5874a158515aa3233f32 /drivers/nvme/host/nvme.h | |
| parent | 2a5cf35cd6c56b2924bce103413ad3381bdc31fa (diff) | |
| parent | 6344d02dc8f886b6bbcd922ae1a17e4a41500f2d (diff) | |
Merge branch 'nvme-4.20' of git://git.infradead.org/nvme into for-linusfor-linus-20181201
Pull NVMe fixes from Christoph:
"Various fixlets all over."
* 'nvme-4.20' of git://git.infradead.org/nvme:
nvme-rdma: fix double freeing of async event data
nvme: flush namespace scanning work just before removing namespaces
nvme: warn when finding multi-port subsystems without multipathing enabled
nvme-pci: fix surprise removal
nvme-fc: initialize nvme_req(rq)->ctrl after calling __nvme_fc_init_request()
nvme: Free ctrl device name on init failure
Diffstat (limited to 'drivers/nvme/host/nvme.h')
| -rw-r--r-- | drivers/nvme/host/nvme.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index cee79cb388af..081cbdcce880 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -531,6 +531,9 @@ static inline void nvme_mpath_check_last_path(struct nvme_ns *ns) static inline int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) { + if (ctrl->subsys->cmic & (1 << 3)) + dev_warn(ctrl->device, +"Please enable CONFIG_NVME_MULTIPATH for full support of multi-port devices.\n"); return 0; } static inline void nvme_mpath_uninit(struct nvme_ctrl *ctrl) |