Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-04-04 14:08:32 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-04-04 14:08:32 +0200
commitc31dfe933ba35b9e95e17d06e48fdde891bb022a (patch)
tree66a6a099ef78bba12754fea8c19615f7066f61f1
parent046c37d6492c8a6ef68d873143e604d02735c0e0 (diff)
parentcd6148ef5370b9430589a400f068f15a84792893 (diff)
Merge branch 'users/jthumshirn/SLE15-SP1/for-next' into SLE15-SP1
-rw-r--r--patches.drivers/nvme-tcp-add-NVMe-over-TCP-host-driver.patch22
1 files changed, 6 insertions, 16 deletions
diff --git a/patches.drivers/nvme-tcp-add-NVMe-over-TCP-host-driver.patch b/patches.drivers/nvme-tcp-add-NVMe-over-TCP-host-driver.patch
index b3b96abc66..3f65e54de0 100644
--- a/patches.drivers/nvme-tcp-add-NVMe-over-TCP-host-driver.patch
+++ b/patches.drivers/nvme-tcp-add-NVMe-over-TCP-host-driver.patch
@@ -25,14 +25,12 @@ Signed-off-by: Solganik Alexander <sashas@lightbitslabs.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Hannes Reinecke <hare@suse.com>
---
- drivers/nvme/host/Kconfig | 15 +
- drivers/nvme/host/Makefile | 3 +
- drivers/nvme/host/tcp.c | 2242 ++++++++++++++++++++++++++++++++++++++++++++
+ drivers/nvme/host/Kconfig | 15
+ drivers/nvme/host/Makefile | 3
+ drivers/nvme/host/tcp.c | 2242 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 2260 insertions(+)
create mode 100644 drivers/nvme/host/tcp.c
-diff --git a/drivers/nvme/host/Kconfig b/drivers/nvme/host/Kconfig
-index 88a8b5916624..0f345e207675 100644
--- a/drivers/nvme/host/Kconfig
+++ b/drivers/nvme/host/Kconfig
@@ -57,3 +57,18 @@ config NVME_FC
@@ -54,11 +52,9 @@ index 88a8b5916624..0f345e207675 100644
+ from https://github.com/linux-nvme/nvme-cli.
+
+ If unsure, say N.
-diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile
-index aea459c65ae1..8a4b671c5f0c 100644
--- a/drivers/nvme/host/Makefile
+++ b/drivers/nvme/host/Makefile
-@@ -7,6 +7,7 @@ obj-$(CONFIG_BLK_DEV_NVME) += nvme.o
+@@ -6,6 +6,7 @@ obj-$(CONFIG_BLK_DEV_NVME) += nvme.o
obj-$(CONFIG_NVME_FABRICS) += nvme-fabrics.o
obj-$(CONFIG_NVME_RDMA) += nvme-rdma.o
obj-$(CONFIG_NVME_FC) += nvme-fc.o
@@ -66,15 +62,12 @@ index aea459c65ae1..8a4b671c5f0c 100644
nvme-core-y := core.o
nvme-core-$(CONFIG_TRACING) += trace.o
-@@ -21,3 +22,5 @@ nvme-fabrics-y += fabrics.o
+@@ -20,3 +21,5 @@ nvme-fabrics-y += fabrics.o
nvme-rdma-y += rdma.o
nvme-fc-y += fc.o
+
+nvme-tcp-y += tcp.o
-diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
-new file mode 100644
-index 000000000000..15543358e245
--- /dev/null
+++ b/drivers/nvme/host/tcp.c
@@ -0,0 +1,2242 @@
@@ -309,7 +302,7 @@ index 000000000000..15543358e245
+ offset = bio->bi_iter.bi_bvec_done;
+ }
+
-+ iov_iter_bvec(&req->iter, dir, vec, nsegs, size);
++ iov_iter_bvec(&req->iter, ITER_BVEC | dir, vec, nsegs, size);
+ req->iter.iov_offset = offset;
+}
+
@@ -2320,6 +2313,3 @@ index 000000000000..15543358e245
+module_exit(nvme_tcp_cleanup_module);
+
+MODULE_LICENSE("GPL v2");
---
-2.16.4
-