diff options
| author | Chris Mason <clm@fb.com> | 2017-02-28 14:35:09 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2017-02-28 14:35:09 -0800 |
| commit | e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b (patch) | |
| tree | e0a2b8e21ed58952c13e6d1dc3646eecd1ea211e /fs/btrfs/zlib.c | |
| parent | ef6ebf324216eaea95ff30da5a8e78e2a4311eba (diff) | |
| parent | 20a7db8ab3f2057a518448b1728d504ffadef65e (diff) | |
| download | lwn-e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b.tar.gz lwn-e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b.zip | |
Merge branch 'for-chris-4.11-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.11
Diffstat (limited to 'fs/btrfs/zlib.c')
| -rw-r--r-- | fs/btrfs/zlib.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c index da497f184ff4..135b10823c6d 100644 --- 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; |