From: Luis Henriques Date: Thu, 24 Nov 2016 17:47:54 +0000 (+0000) Subject: Revert "nvme: use the DMA_ATTR_NO_WARN attribute" X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~1469 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=32a5e3aaa2cae6dec02e2b2b26b198c598b5ffe1;p=mirror_ubuntu-artful-kernel.git 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 --- diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index b667613a0548..aef865255f7c 100644 --- 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)))