dm-integrity: replace bvec_kmap_local with kmap_local_page

Replace bvec_kmap_local with kmap_local_page - it will be needed for the
upcoming patches that make kmap_local_page optional, depending on whether
asynchronous hash interface is used or not.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>

diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index 29bb405cdd0312c3a15022c7870022fcfc023319..7d34a7de02ba0e4a2f205cd8bfb2a1a57dba188f 100644 (file)
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -1838,11 +1838,11 @@ static void integrity_metadata(struct work_struct *w)
                        char *mem, *checksums_ptr;
 
 again:
-                       mem = bvec_kmap_local(&bv_copy);
+                       mem = kmap_local_page(bv_copy.bv_page);
                        pos = 0;
                        checksums_ptr = checksums;
                        do {
-                               integrity_sector_checksum(ic, sector, mem + pos, checksums_ptr);
+                               integrity_sector_checksum(ic, sector, mem + bv_copy.bv_offset + pos, checksums_ptr);
                                checksums_ptr += ic->tag_size;
                                sectors_to_process -= ic->sectors_per_block;
                                pos += ic->sectors_per_block << SECTOR_SHIFT;
@@ -2506,10 +2506,10 @@ skip_spinlock:
                unsigned pos = 0;
                while (dio->bio_details.bi_iter.bi_size) {
                        struct bio_vec bv = bio_iter_iovec(bio, dio->bio_details.bi_iter);
-                       const char *mem = bvec_kmap_local(&bv);
+                       const char *mem = kmap_local_page(bv.bv_page);
                        if (ic->tag_size < ic->tuple_size)
                                memset(dio->integrity_payload + pos + ic->tag_size, 0, ic->tuple_size - ic->tuple_size);
-                       integrity_sector_checksum(ic, dio->bio_details.bi_iter.bi_sector, mem, dio->integrity_payload + pos);
+                       integrity_sector_checksum(ic, dio->bio_details.bi_iter.bi_sector, mem + bv.bv_offset, dio->integrity_payload + pos);
                        kunmap_local(mem);
                        pos += ic->tuple_size;
                        bio_advance_iter_single(bio, &dio->bio_details.bi_iter, ic->sectors_per_block << SECTOR_SHIFT);
@@ -2626,9 +2626,8 @@ static int dm_integrity_end_io(struct dm_target *ti, struct bio *bio, blk_status
                        while (dio->bio_details.bi_iter.bi_size) {
                                char digest[HASH_MAX_DIGESTSIZE];
                                struct bio_vec bv = bio_iter_iovec(bio, dio->bio_details.bi_iter);
-                               char *mem = bvec_kmap_local(&bv);
-                               //memset(mem, 0xff, ic->sectors_per_block << SECTOR_SHIFT);
-                               integrity_sector_checksum(ic, dio->bio_details.bi_iter.bi_sector, mem, digest);
+                               char *mem = kmap_local_page(bv.bv_page);
+                               integrity_sector_checksum(ic, dio->bio_details.bi_iter.bi_sector, mem + bv.bv_offset, digest);
                                if (unlikely(crypto_memneq(digest, dio->integrity_payload + pos,
                                                min(ic->internal_hash_digestsize, ic->tag_size)))) {
                                        kunmap_local(mem);