]> www.infradead.org Git - users/hch/block.git/commitdiff
zram: use memcpy_from_bvec in zram_bvec_write
authorChristoph Hellwig <hch@lst.de>
Thu, 20 May 2021 12:49:32 +0000 (14:49 +0200)
committerChristoph Hellwig <hch@lst.de>
Fri, 21 May 2021 05:55:28 +0000 (07:55 +0200)
Use memcpy_from_bvec instead of open coding the logic.

Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/block/zram/zram_drv.c

index 1954c9da376879e46a8995c29de711ad24bd96fe..f15057843a473e9e40e1590fef53d79d69cba994 100644 (file)
@@ -1440,7 +1440,6 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec,
 {
        int ret;
        struct page *page = NULL;
-       void *src;
        struct bio_vec vec;
 
        vec = *bvec;
@@ -1458,11 +1457,9 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec,
                if (ret)
                        goto out;
 
-               src = kmap_atomic(bvec->bv_page);
                dst = kmap_atomic(page);
-               memcpy(dst + offset, src + bvec->bv_offset, bvec->bv_len);
+               memcpy_from_bvec(dst + offset, bvec);
                kunmap_atomic(dst);
-               kunmap_atomic(src);
 
                vec.bv_page = page;
                vec.bv_len = PAGE_SIZE;