Revert "nvme: use the DMA_ATTR_NO_WARN attribute"

BugLink: https://bugs.launchpad.net/bugs/1644596
This reverts commit 7c50722ad76b1b90538912fb84e2c3e206fab327.

The backports that fix bug #1633128 for xenial, in particular the backport
of upstream commit a9a62c938441 ("dma-mapping: introduce the
DMA_ATTR_NO_WARN attribute"), introduce a regression.

Signed-off-by: Luis Henriques <luis.henriques@canonical.com>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index b667613a05488bb02ffb43ebc7b017dc0bbfaed7..aef865255f7c2579f1242d62bf78fad69840b913 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -557,8 +557,7 @@ static int nvme_map_data(struct nvme_dev *dev, struct request *req,
                goto out;
 
        ret = BLK_MQ_RQ_QUEUE_BUSY;
-       if (!dma_map_sg_attrs(dev->dev, iod->sg, iod->nents, dma_dir,
-                               DMA_ATTR_NO_WARN))
+       if (!dma_map_sg(dev->dev, iod->sg, iod->nents, dma_dir))
                goto out;
 
        if (!nvme_setup_prps(dev, req, blk_rq_bytes(req)))