From: Ira Weiny <ira.weiny@xxxxxxxxx>
Remove the kmap/mem*()/kunmap patter and use the new mem*_page()
functions.
Cc: "Martin K. Petersen" <martin.petersen@xxxxxxxxxx>
Signed-off-by: Ira Weiny <ira.weiny@xxxxxxxxx>
---
drivers/target/target_core_rd.c | 6 ++----
drivers/target/target_core_transport.c | 10 +++-------
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index bf936bbeccfe..30bf0fcae519 100644
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -18,6 +18,7 @@
#include <linux/scatterlist.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
+#include <linux/pagemap.h>
#include <scsi/scsi_proto.h>
#include <target/target_core_base.h>
@@ -117,7 +118,6 @@ static int rd_allocate_sgl_table(struct rd_dev *rd_dev, struct rd_dev_sg_table *
sizeof(struct scatterlist));
struct page *pg;
struct scatterlist *sg;
- unsigned char *p;
while (total_sg_needed) {
unsigned int chain_entry = 0;
@@ -159,9 +159,7 @@ static int rd_allocate_sgl_table(struct rd_dev *rd_dev, struct rd_dev_sg_table *
sg_assign_page(&sg[j], pg);
sg[j].length = PAGE_SIZE;
- p = kmap(pg);
- memset(p, init_payload, PAGE_SIZE);
- kunmap(pg);
+ memset_page(pg, init_payload, 0, PAGE_SIZE);
}
page_offset += sg_per_table;
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index ff26ab0a5f60..4fec5c728344 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/ratelimit.h>
#include <linux/vmalloc.h>
+#include <linux/pagemap.h>
#include <asm/unaligned.h>
#include <net/sock.h>
#include <net/tcp.h>
@@ -1689,15 +1690,10 @@ int target_submit_cmd_map_sgls(struct se_cmd *se_cmd, struct se_session *se_sess
*/
if (!(se_cmd->se_cmd_flags & SCF_SCSI_DATA_CDB) &&
se_cmd->data_direction == DMA_FROM_DEVICE) {
- unsigned char *buf = NULL;
if (sgl)
- buf = kmap(sg_page(sgl)) + sgl->offset;
-
- if (buf) {
- memset(buf, 0, sgl->length);
- kunmap(sg_page(sgl));
- }
+ memzero_page(sg_page(sgl), sgl->offset,
+ sgl->length);
}
rc = transport_generic_map_mem_to_cmd(se_cmd, sgl, sgl_count,
--
2.28.0.rc0.12.gb6a658bd00c9
