← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to fs/btrfs/zlib.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/btrfs/zlib.c
57
57
        if (!workspace)
58
58
                return ERR_PTR(-ENOMEM);
59
59
 
60
 
        workspace->def_strm.workspace = vmalloc(zlib_deflate_workspacesize());
 
60
        workspace->def_strm.workspace = vmalloc(zlib_deflate_workspacesize(
 
61
                                                MAX_WBITS, MAX_MEM_LEVEL));
61
62
        workspace->inf_strm.workspace = vmalloc(zlib_inflate_workspacesize());
62
63
        workspace->buf = kmalloc(PAGE_CACHE_SIZE, GFP_NOFS);
63
64
        if (!workspace->def_strm.workspace ||