Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[karo-tx-linux.git] / fs / btrfs / zlib.c

diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index da497f184ff4d2dad86606ab5776e2c49c211c62..135b10823c6dbd1d20171234d5db60961aff1377 100644 (file)
--- a/fs/btrfs/zlib.c
+++ b/fs/btrfs/zlib.c
@@ -73,13 +73,11 @@ fail:
 
 static int zlib_compress_pages(struct list_head *ws,
                               struct address_space *mapping,
-                              u64 start, unsigned long len,
+                              u64 start,
                               struct page **pages,
-                              unsigned long nr_dest_pages,
                               unsigned long *out_pages,
                               unsigned long *total_in,
-                              unsigned long *total_out,
-                              unsigned long max_out)
+                              unsigned long *total_out)
 {
        struct workspace *workspace = list_entry(ws, struct workspace, list);
        int ret;
@@ -89,6 +87,9 @@ static int zlib_compress_pages(struct list_head *ws,
        struct page *in_page = NULL;
        struct page *out_page = NULL;
        unsigned long bytes_left;
+       unsigned long len = *total_out;
+       unsigned long nr_dest_pages = *out_pages;
+       const unsigned long max_out = nr_dest_pages * PAGE_SIZE;
 
        *out_pages = 0;
        *total_out = 0;