| Message ID | 20190731162810.8316-2-kleber.souza@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,Bionic,1/1] Revert "nvme: warn when finding multi-port subsystems without multipathing enabled" | expand |
On 7/31/19 9:28 AM, Kleber Sacilotto de Souza wrote: > https://bugs.launchpad.net/bugs/1838533 > > This reverts commit 993f70b886c0062fb5ec7c3c556d074bb3380b9d. > > Commit 993f70b886c0062fb5ec7c3c556d074bb3380b9d, which is > 14a1336e6fff47dd1028b484d6c802105c58e2ee upstream, has been wrongly > backported to bionic/linux changing a different function, causing > the build to failure when CONFIG_NVM is disabled. The function which it > fixed isn't implemented yet on 4.15, so it can be safely reverted. > > Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> Acked-by: Connor Kuehl <connor.kuehl@canonical.com> > --- > drivers/nvme/host/nvme.h | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h > index 9fa97d79159a..324174325638 100644 > --- a/drivers/nvme/host/nvme.h > +++ b/drivers/nvme/host/nvme.h > @@ -499,9 +499,6 @@ static inline int nvme_nvm_register(struct nvme_ns *ns, char *disk_name, > static inline void nvme_nvm_unregister(struct nvme_ns *ns) {}; > static inline int nvme_nvm_register_sysfs(struct nvme_ns *ns) > { > - 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_nvm_unregister_sysfs(struct nvme_ns *ns) {}; >
On 31.07.19 18:28, Kleber Sacilotto de Souza wrote: > https://bugs.launchpad.net/bugs/1838533 Duh, I forgot to add BugLink ^. Please add it when applying. > > This reverts commit 993f70b886c0062fb5ec7c3c556d074bb3380b9d. > > Commit 993f70b886c0062fb5ec7c3c556d074bb3380b9d, which is > 14a1336e6fff47dd1028b484d6c802105c58e2ee upstream, has been wrongly > backported to bionic/linux changing a different function, causing > the build to failure when CONFIG_NVM is disabled. The function which it > fixed isn't implemented yet on 4.15, so it can be safely reverted. > > Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > drivers/nvme/host/nvme.h | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h > index 9fa97d79159a..324174325638 100644 > --- a/drivers/nvme/host/nvme.h > +++ b/drivers/nvme/host/nvme.h > @@ -499,9 +499,6 @@ static inline int nvme_nvm_register(struct nvme_ns *ns, char *disk_name, > static inline void nvme_nvm_unregister(struct nvme_ns *ns) {}; > static inline int nvme_nvm_register_sysfs(struct nvme_ns *ns) > { > - 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_nvm_unregister_sysfs(struct nvme_ns *ns) {}; >
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 9fa97d79159a..324174325638 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -499,9 +499,6 @@ static inline int nvme_nvm_register(struct nvme_ns *ns, char *disk_name, static inline void nvme_nvm_unregister(struct nvme_ns *ns) {}; static inline int nvme_nvm_register_sysfs(struct nvme_ns *ns) { - 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_nvm_unregister_sysfs(struct nvme_ns *ns) {};
https://bugs.launchpad.net/bugs/1838533 This reverts commit 993f70b886c0062fb5ec7c3c556d074bb3380b9d. Commit 993f70b886c0062fb5ec7c3c556d074bb3380b9d, which is 14a1336e6fff47dd1028b484d6c802105c58e2ee upstream, has been wrongly backported to bionic/linux changing a different function, causing the build to failure when CONFIG_NVM is disabled. The function which it fixed isn't implemented yet on 4.15, so it can be safely reverted. Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> --- drivers/nvme/host/nvme.h | 3 --- 1 file changed, 3 deletions(-)