Merge tag 'pci-v4.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-block.git] / drivers / nvme / target / io-cmd-bdev.c

diff --git a/drivers/nvme/target/io-cmd-bdev.c b/drivers/nvme/target/io-cmd-bdev.c
index f93fb571114280b3b0408e678e187adb561a3f22..c1ec3475a1407a1f0a52ff4d12f214fbe7c8df12 100644 (file)
--- a/drivers/nvme/target/io-cmd-bdev.c
+++ b/drivers/nvme/target/io-cmd-bdev.c
@@ -78,6 +78,9 @@ static void nvmet_bdev_execute_rw(struct nvmet_req *req)
                op = REQ_OP_READ;
        }
 
+       if (is_pci_p2pdma_page(sg_page(req->sg)))
+               op_flags |= REQ_NOMERGE;
+
        sector = le64_to_cpu(req->cmd->rw.slba);
        sector <<= (req->ns->blksize_shift - 9);