Merge tag 'for-5.15-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

[linux-2.6-microblaze.git] / fs / btrfs / zstd.c

diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
index 8e9626d..56dce9f 100644 (file)
--- a/fs/btrfs/zstd.c
+++ b/fs/btrfs/zstd.c
@@ -399,19 +399,19 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,
 
        /* map in the first page of input data */
        in_page = find_get_page(mapping, start >> PAGE_SHIFT);
-       workspace->in_buf.src = kmap(in_page);
+       workspace->in_buf.src = page_address(in_page);
        workspace->in_buf.pos = 0;
        workspace->in_buf.size = min_t(size_t, len, PAGE_SIZE);
 
 
        /* Allocate and map in the output buffer */
-       out_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);
+       out_page = alloc_page(GFP_NOFS);
        if (out_page == NULL) {
                ret = -ENOMEM;
                goto out;
        }
        pages[nr_pages++] = out_page;
-       workspace->out_buf.dst = kmap(out_page);
+       workspace->out_buf.dst = page_address(out_page);
        workspace->out_buf.pos = 0;
        workspace->out_buf.size = min_t(size_t, max_out, PAGE_SIZE);
 
@@ -446,19 +446,18 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,
                if (workspace->out_buf.pos == workspace->out_buf.size) {
                        tot_out += PAGE_SIZE;
                        max_out -= PAGE_SIZE;
-                       kunmap(out_page);
                        if (nr_pages == nr_dest_pages) {
                                out_page = NULL;
                                ret = -E2BIG;
                                goto out;
                        }
-                       out_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);
+                       out_page = alloc_page(GFP_NOFS);
                        if (out_page == NULL) {
                                ret = -ENOMEM;
                                goto out;
                        }
                        pages[nr_pages++] = out_page;
-                       workspace->out_buf.dst = kmap(out_page);
+                       workspace->out_buf.dst = page_address(out_page);
                        workspace->out_buf.pos = 0;
                        workspace->out_buf.size = min_t(size_t, max_out,
                                                        PAGE_SIZE);
@@ -473,13 +472,12 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,
                /* Check if we need more input */
                if (workspace->in_buf.pos == workspace->in_buf.size) {
                        tot_in += PAGE_SIZE;
-                       kunmap(in_page);
                        put_page(in_page);
 
                        start += PAGE_SIZE;
                        len -= PAGE_SIZE;
                        in_page = find_get_page(mapping, start >> PAGE_SHIFT);
-                       workspace->in_buf.src = kmap(in_page);
+                       workspace->in_buf.src = page_address(in_page);
                        workspace->in_buf.pos = 0;
                        workspace->in_buf.size = min_t(size_t, len, PAGE_SIZE);
                }
@@ -506,19 +504,18 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,
 
                tot_out += PAGE_SIZE;
                max_out -= PAGE_SIZE;
-               kunmap(out_page);
                if (nr_pages == nr_dest_pages) {
                        out_page = NULL;
                        ret = -E2BIG;
                        goto out;
                }
-               out_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);
+               out_page = alloc_page(GFP_NOFS);
                if (out_page == NULL) {
                        ret = -ENOMEM;
                        goto out;
                }
                pages[nr_pages++] = out_page;
-               workspace->out_buf.dst = kmap(out_page);
+               workspace->out_buf.dst = page_address(out_page);
                workspace->out_buf.pos = 0;
                workspace->out_buf.size = min_t(size_t, max_out, PAGE_SIZE);
        }
@@ -534,12 +531,8 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,
 out:
        *out_pages = nr_pages;
        /* Cleanup */
-       if (in_page) {
-               kunmap(in_page);
+       if (in_page)
                put_page(in_page);
-       }
-       if (out_page)
-               kunmap(out_page);
        return ret;
 }
 
@@ -547,8 +540,6 @@ int zstd_decompress_bio(struct list_head *ws, struct compressed_bio *cb)
 {
        struct workspace *workspace = list_entry(ws, struct workspace, list);
        struct page **pages_in = cb->compressed_pages;
-       u64 disk_start = cb->start;
-       struct bio *orig_bio = cb->orig_bio;
        size_t srclen = cb->compressed_len;
        ZSTD_DStream *stream;
        int ret = 0;
@@ -565,7 +556,7 @@ int zstd_decompress_bio(struct list_head *ws, struct compressed_bio *cb)
                goto done;
        }
 
-       workspace->in_buf.src = kmap(pages_in[page_in_index]);
+       workspace->in_buf.src = page_address(pages_in[page_in_index]);
        workspace->in_buf.pos = 0;
        workspace->in_buf.size = min_t(size_t, srclen, PAGE_SIZE);
 
@@ -589,7 +580,7 @@ int zstd_decompress_bio(struct list_head *ws, struct compressed_bio *cb)
                workspace->out_buf.pos = 0;
 
                ret = btrfs_decompress_buf2page(workspace->out_buf.dst,
-                               buf_start, total_out, disk_start, orig_bio);
+                               total_out - buf_start, cb, buf_start);
                if (ret == 0)
                        break;
 
@@ -601,23 +592,21 @@ int zstd_decompress_bio(struct list_head *ws, struct compressed_bio *cb)
                        break;
 
                if (workspace->in_buf.pos == workspace->in_buf.size) {
-                       kunmap(pages_in[page_in_index++]);
+                       page_in_index++;
                        if (page_in_index >= total_pages_in) {
                                workspace->in_buf.src = NULL;
                                ret = -EIO;
                                goto done;
                        }
                        srclen -= PAGE_SIZE;
-                       workspace->in_buf.src = kmap(pages_in[page_in_index]);
+                       workspace->in_buf.src = page_address(pages_in[page_in_index]);
                        workspace->in_buf.pos = 0;
                        workspace->in_buf.size = min_t(size_t, srclen, PAGE_SIZE);
                }
        }
        ret = 0;
-       zero_fill_bio(orig_bio);
+       zero_fill_bio(cb->orig_bio);
 done:
-       if (workspace->in_buf.src)
-               kunmap(pages_in[page_in_index]);
        return ret;
 }
 
@@ -631,7 +620,6 @@ int zstd_decompress(struct list_head *ws, unsigned char *data_in,
        size_t ret2;
        unsigned long total_out = 0;
        unsigned long pg_offset = 0;
-       char *kaddr;
 
        stream = ZSTD_initDStream(
                        ZSTD_BTRFS_MAX_INPUT, workspace->mem, workspace->size);
@@ -696,9 +684,7 @@ int zstd_decompress(struct list_head *ws, unsigned char *data_in,
        ret = 0;
 finish:
        if (pg_offset < destlen) {
-               kaddr = kmap_atomic(dest_page);
-               memset(kaddr + pg_offset, 0, destlen - pg_offset);
-               kunmap_atomic(kaddr);
+               memzero_page(dest_page, pg_offset, destlen - pg_offset);
        }
        return ret;
 }